From: Evan Broder <broder@mit.edu>
Date: Sat, 18 Oct 2008 21:20:15 +0000 (-0400)
Subject: Correctly pass the CD image onto xm create in sipb-xen-remctl-auto
X-Git-Tag: sipb-xen-remctl-auto/1.4^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/726af5c11e1b8270e1f0246d5d9c0e0789d44026

Correctly pass the CD image onto xm create in sipb-xen-remctl-auto

svn path=/trunk/packages/sipb-xen-remctl-auto/; revision=1128
---

diff --git a/debian/changelog b/debian/changelog
index 151c986..5ef72a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-remctl-auto (1.4) unstable; urgency=low
+
+  * Correctly extract the CDROM image from the remctl arguments
+
+ -- Evan Broder <broder@mit.edu>  Sat, 18 Oct 2008 17:19:57 -0400
+
 sipb-xen-remctl-auto (1.3.1) unstable; urgency=low
 
   * Quote the installer arguments correctly
diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/sipb-xen-vmcontrol
index 6520940..081afd2 100755
--- a/files/usr/sbin/sipb-xen-vmcontrol
+++ b/files/usr/sbin/sipb-xen-vmcontrol
@@ -30,10 +30,8 @@ case "$ACTION" in
 	fi
 	if [ "$ACTION" = "install" ]; then
 	    xm create sipb-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
-#	elif [ "$ACTION" = "copy" ]; then
-#           sipb-xen-duplicate ...etc...
-	elif [ -n "$ARG" ]; then
-	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$ARG"
+	elif [ -n "$1" ]; then
+	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$1"
 	else
 	    xm create sipb-database machine_name="$ORIGMACHINE"
 	fi