X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/7ab6f6791b6ff08e548873155cba0410413096e7..ab8fe311418a7887658ddd752a6dc69a8164bdb5:/files/usr/sbin/sipb-xen-vmcontrol?ds=inline

diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/sipb-xen-vmcontrol
index 4d055bb..0c20109 100755
--- a/files/usr/sbin/sipb-xen-vmcontrol
+++ b/files/usr/sbin/sipb-xen-vmcontrol
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # sipb-xen-vmcontrol MACHINE ACTION
 #
 # remctl should have already verified that the user is authorized to
@@ -19,34 +19,29 @@ case "$ACTION" in
 	;;
     destroy|shutdown)
 	xm "$ACTION" "$MACHINE"
-	rm "/etc/conserver/conf.d/$MACHINE"
-	/usr/sbin/sipb-xen-update-conserver
+	/usr/sbin/sipb-xen-update-conserver </dev/null >/dev/null 2>&1 &
 	;;
     install|create|reboot)
-	ARG="$3"
-	shift; shift; shift; MOREARGS="$*"
+	shift; shift;
 	if [ "$ACTION" = "reboot" ]; then
 	    xm destroy "$MACHINE" 2>/dev/null
 	else
 	    xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
 	fi
 	if [ "$ACTION" = "install" ]; then
-	    xm create sipb-database machine_name="$ORIGMACHINE" installer="$ARG" installer_options="$MOREARGS"
-#	elif [ "$ACTION" = "copy" ]; then
-#           sipb-xen-duplicate ...etc...
-	elif [ -n "$ARG" ]; then
-	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$ARG"
+	    xm create sipb-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
+	elif [ -n "$1" ]; then
+	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$1"
 	else
 	    xm create sipb-database machine_name="$ORIGMACHINE"
 	fi
-	echo "console $ORIGMACHINE {}" >"/etc/conserver/conf.d/$MACHINE"
-	/usr/sbin/sipb-xen-update-conserver
+	(sleep 4; /usr/sbin/sipb-xen-update-conserver) </dev/null >/dev/null 2>&1 &
 	;;
     list-long)
 	xm list --long "$MACHINE"
 	;;
     *)
         echo "ERROR: Invalid Command"
-        exit 1
+        exit 34
         ;;
 esac