From 8c806f6dad2b8ecd9ef1f30c144e23da0e2f47de Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 31 Aug 2010 15:32:29 -0700
Subject: [PATCH] if domr serves as dhcpsrvr, consider it as type domr

---
 patches/xenserver/root/patchsystemvm.sh | 28 ++++++++++---------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/patches/xenserver/root/patchsystemvm.sh b/patches/xenserver/root/patchsystemvm.sh
index f878ea11aa8..f3341c55b21 100755
--- a/patches/xenserver/root/patchsystemvm.sh
+++ b/patches/xenserver/root/patchsystemvm.sh
@@ -73,7 +73,7 @@ for i in $CMDLINE
     esac
 done
 
-if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ]  && [ -f /media/cdrom/systemvm.zip ]
+if [ "$TYPE" = "consoleproxy" ] || [ "$TYPE" = "secstorage" ]  && [ -f /media/cdrom/systemvm.zip ]
 then
   patch_console_proxy /media/cdrom/systemvm.zip
   if [ $? -gt 0 ]
@@ -87,33 +87,27 @@ fi
 #empty known hosts
 echo "" > /root/.ssh/known_hosts
 
-if [ "$TYPE" == "router" ]
-then
-  routing_svcs
-  if [ $? -gt 0 ]
-  then
-    printf "Failed to execute routing_svcs\n" >$logfile
-    exit 6
-  fi
-fi
-
-
-if [ "$TYPE" == "consoleproxy" ]
+if [ "$TYPE" = "consoleproxy" ]
 then
   consoleproxy_svcs
   if [ $? -gt 0 ]
   then
     printf "Failed to execute consoleproxy_svcs\n" >$logfile
-    exit 7
+    exit 6
   fi
-fi
-
-if [ "$TYPE" == "secstorage" ]
+elif [ "$TYPE" = "secstorage" ]
 then
   secstorage_svcs
   if [ $? -gt 0 ]
   then
     printf "Failed to execute secstorage_svcs\n" >$logfile
+    exit 7
+  fi
+else
+  routing_svcs
+  if [ $? -gt 0 ]
+  then
+    printf "Failed to execute routing_svcs\n" >$logfile
     exit 8
   fi
 fi