new names for build vm creation scripts

[infrastructure.git] / scripts / create-vm.sh

diff --git a/scripts/create-vm.sh b/scripts/create-vm.sh
index 8672d67..6503e20 100755 (executable)
--- a/scripts/create-vm.sh
+++ b/scripts/create-vm.sh
@@ -13,7 +13,7 @@ INTERACTIVE=
 DISTRO=$DEFAULT_DISTRO
 PERSO=$DEFAULT_PERSO
 function usage () {
-  message="$1" ; shift
+  message="$@" 
   echo "usage : $COMMAND [-i] [-f distro] [-p perso] hostname"
   echo "  default distro is $DEFAULT_DISTRO"
   echo "  default perso is $DEFAULT_PERSO"
@@ -21,7 +21,7 @@ function usage () {
   exit 1
 }
 
-while getopts "fp:ih" flag; do
+while getopts "f:p:ih" flag; do
     case $flag in
        f) DISTRO=$OPTARG;;
        p) PERSO=$OPTARG;;
@@ -32,7 +32,7 @@ done
 shift $((OPTIND-1))
 [[ -z "$@" ]] && usage "no hostname provided"
 HOSTNAME="$1" ; shift
-[[ -n "$@" ]] && usage "extra arguments"
+[[ -n "$@" ]] && usage "extra arguments"  "$@" "(hostname=$HOSTNAME)"
 
 
 [ -d "$BUILD" ] || usage "Could not find directory $BUILD"
@@ -49,12 +49,12 @@ cd $BUILD
 git pull
 cd -
 
-command="$BUILD/vtest-init-vserver.sh -p $PERSO -f $DISTRO $HOSTNAME none -- --netdev eth0 --interface $ip --hostname $fqdn"
+# single_ip needs to be turned off, vtest-initvm now takes care of that
+command="$BUILD/vtest-initvm.sh -p $PERSO -f $DISTRO $HOSTNAME none -- --interface eth0:$ip --hostname $fqdn"
 
 if [ -n "$INTERACTIVE" ] ; then
-    echo "Run $command OK ? "
-    read _ ; case $_ in [nN]*) exit 1 ;; esac
+    echo -n "Run $command OK ? "
+    read answer ; case $answer in [nN]*) exit 1 ;; esac
 fi
 
-echo YES $command ; exit 
 $command