X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fcreate-vm.sh;h=de6a0056278fade97daaa0b6913a81ba8fb2b7f5;hb=fb4c38318689de627b8611d95b08ba851aaa79f8;hp=5bf5cfaf7ca446eed1a78b49883a74c943b01155;hpb=1c786545fcb9bc967e0052d2023aa5709e45fb94;p=infrastructure.git

diff --git a/scripts/create-vm.sh b/scripts/create-vm.sh
index 5bf5cfa..de6a005 100755
--- a/scripts/create-vm.sh
+++ b/scripts/create-vm.sh
@@ -38,13 +38,14 @@ function usage () {
   exit 1
 }
 
+# using HOSTNAME won't work as this is already set in environment
 while getopts "cf:i:m:n:h" flag; do
     case $flag in
 	c) CONFIRM=true ;;
 	f) DISTRO=$OPTARG ;;
         i) IMAGE=$OPTARG ;;
 	m) MEMORY=$OPTARG ;;
-	n) HOSTNAME=$OPTARG ;;
+	n) VM_HOSTNAME=$OPTARG ;;
 	?|h) usage "" ;;
     esac
 done
@@ -60,14 +61,13 @@ container="$1" ; shift
 
 # comopute all vars from args
 [ -z "$DISTRO" ] && DISTRO="$DEFAULT_DISTRO"
-[ -z "$HOSTNAME" ] && HOSTNAME="$container"
-fqdn=$HOSTNAME.$DOMAIN
+[ -z "$VM_HOSTNAME" ] && VM_HOSTNAME="$container"
+fqdn=$VM_HOSTNAME.$DOMAIN
 
 # prepare initvm command
 initvm="$BUILD/lbuild-initvm.sh"
-initvm="$initvm -f $DISTRO"
+[ -z "$IMAGE" ] && initvm="$initvm -f $DISTRO" || initvm="$initvm -i $IMAGE"
 initvm="$initvm -n $fqdn"
-[ -n "$IMAGE" ] && initvm="$initvm -i $IMAGE"
 [ -n "$MEMORY" ] && initvm="$initvm -m $MEMORY" 
 initvm="$initvm $container"