From 13b7ca1b3fc3d3c44d677307a59a5205b6c881bb Mon Sep 17 00:00:00 2001
From: Ian Southam <isoutham@schubergphilis.com>
Date: Thu, 13 Nov 2014 17:16:38 +0100
Subject: [PATCH] New code must not run on systemvm

---
 .../debian/config/etc/init.d/cloud-early-config      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 7db47faef7d..729b58f5f6a 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1289,10 +1289,18 @@ start() {
      router)
          [ "$NAME" == "" ] && NAME=router
          setup_router
+         if [ -x /opt/cloud/bin/update_config.py ]
+         then
+	         /opt/cloud/bin/update_config.py cmd_line.json
+         fi
 	  ;;
      vpcrouter)
          [ "$NAME" == "" ] && NAME=vpcrouter
          setup_vpcrouter
+         if [ -x /opt/cloud/bin/update_config.py ]
+         then
+	         /opt/cloud/bin/update_config.py cmd_line.json
+         fi
 	  ;;
      dhcpsrvr)
          [ "$NAME" == "" ] && NAME=dhcpsrvr
@@ -1323,10 +1331,6 @@ start() {
     # eject the systemvm.iso
      eject
   fi
-  if [ -x /opt/cloud/bin/update_config.py ]
-  then
-	  /opt/cloud/bin/update_config.py cmd_line.json
-  fi
   return 0
 }