Correctly quote arguments to the installer in sipb-xen-vmcontrol

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

diff --git a/debian/changelog b/debian/changelog
index a2c20bf..151c986 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-remctl-auto (1.3.1) unstable; urgency=low
+
+  * Quote the installer arguments correctly
+
+ -- Evan Broder <broder@mit.edu>  Fri, 10 Oct 2008 01:47:54 -0400
+

 sipb-xen-remctl-auto (1.3) unstable; urgency=low
 
   * Respond to remctl install requests by passing the options onto Xen
 sipb-xen-remctl-auto (1.3) unstable; urgency=low
 
   * Respond to remctl install requests by passing the options onto Xen

diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/sipb-xen-vmcontrol
index d671033..6520940 100755 (executable)
--- 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
 # sipb-xen-vmcontrol MACHINE ACTION
 #
 # remctl should have already verified that the user is authorized to

@@ -29,7 +29,7 @@ case "$ACTION" in
            xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
        fi
        if [ "$ACTION" = "install" ]; then
            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_options=\""$*"\"
+           xm create sipb-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"

 #      elif [ "$ACTION" = "copy" ]; then
 #           sipb-xen-duplicate ...etc...
        elif [ -n "$ARG" ]; then
 #      elif [ "$ACTION" = "copy" ]; then
 #           sipb-xen-duplicate ...etc...
        elif [ -n "$ARG" ]; then