From 3131bd4d5e3b469e75f87f22dfbf3ea6f19bd2fe Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 29 May 2012 16:45:52 -0700 Subject: [PATCH] CS-14421: Clean /etc/network/interfaces when sysytemvm reboot In order to make sure next time, booting process would use cloud-early-config's setup, rather than networking scripts to bring up interfaces. Reviewed-by: Kelven Yang --- .../systemvm/debian/config/etc/init.d/cloud-early-config | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 9c0d189046f..19f87c23e04 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -696,11 +696,8 @@ setup_elbvm() { setup_default() { cat > /etc/network/interfaces << EOF -auto lo eth0 +auto lo iface lo inet loopback - -iface eth0 inet static - EOF } @@ -895,7 +892,9 @@ start) ;; stop) - log_action_begin_msg "Stopping cloud-early-config (noop)" + log_action_begin_msg "Stopping cloud-early-config" + #Override old system's interface setting + setup_default; log_action_end_msg 0 ;;