Updated Branches: refs/heads/3.0.x fc7032450 -> 6c4f55f93
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 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6c4f55f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6c4f55f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6c4f55f9 Branch: refs/heads/3.0.x Commit: 6c4f55f9346c7a83f911d6c66819426de663103e Parents: fc70324 Author: Sheng Yang <[email protected]> Authored: Tue May 29 16:45:52 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Thu May 31 17:56:48 2012 -0700 ---------------------------------------------------------------------- .../debian/config/etc/init.d/cloud-early-config | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6c4f55f9/patches/systemvm/debian/config/etc/init.d/cloud-early-config ---------------------------------------------------------------------- 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 9c0d189..19f87c2 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 ;;
