minor fixes

[tests.git] / system / template-qemu / qemu-start-node

diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node
index 42c0d2e..0b4eab4 100755 (executable)
--- a/system/template-qemu/qemu-start-node
+++ b/system/template-qemu/qemu-start-node
@@ -1,26 +1,26 @@
 #!/bin/bash
 
 # cd in this command's directory
+COMMAND=$(basename $0)
 cd $(dirname $0)
 
 ########## globals
-HDA=hard_drive.img
 RAM=1024
-qemu-img create -f qcow2 $HDA 10G
+DISK_SIZE=10G
+HDA=hdd-cow2-${DISK_SIZE}.img
+QEMU_CREATE_IMAGE="qemu-img create -f qcow2 $HDA ${DISK_SIZE}"
 
 SCRIPT=qemu-ifup
 TAP="tap,script=$SCRIPT"
 
 ########## from the test environment
-# expected vars are MACADDR, NODE_ISO, HOSTNAME and TARGET_ARCH
+# expected vars are MACADDR, NODE_ISO, HOSTNAME, IP and TARGET_ARCH
 CONFIG=qemu.conf
-if [ ! -e ${CONFIG} ];then
-    echo "File for node_iso version not found"
-    exit 1
-fi
+[ -f "$CONFIG" ] || { echo "Config file for qemu $CONFIG not found in $(pwd)" ; exit 1 ; }
 . $CONFIG
 
 # the launcher, depending on local/target archs
+# make sure to check qemu-kill-node for consistency
 archs="$(uname -i)+$TARGET_ARCH"
 case $archs in
     i386+i386)         QEMU=qemu;;
@@ -29,23 +29,26 @@ case $archs in
     x86_64+x86_64)     QEMU=qemu-system-x86_64;;
 esac
 
+echo "Running $COMMAND in $(pwd)"
+echo "Starting at $(date)"
+
 #Creating new HDA if needed only
 #using qcow2 disk image format which is essential to support VM snapshots
 if [ -f $HDA ] ; then
-    echo "Using $HDA"
+    echo "Using existing $HDA"
 else
-    echo "Creating hard disk (10G) for Qemu install under $HDA"
+    echo -n "Creating hard disk image (${DISK_SIZE}) as $HDA .. "
     img=$($QEMU_CREATE_IMAGE)
     if [ -z "$img" ];then
-       echo "Can't Create disk image..."
+       echo "Failed"
        exit 1
     fi
-    echo "New image $HDA created"
+    echo "Done"
 fi
 
 rm -f qemu.pid
 
 #Command for running the Qemu Emulator
-ARGS="-boot d  -net nic,macaddr=${MACADDR} -net $TAP, -cdrom ${NODE_ISO} -hda ${HDA} -m ${RAM} -nographic  -pidfile qemu.pid"
+ARGS="-boot d  -net nic,macaddr=${MACADDR} -net $TAP, -cdrom ${NODE_ISO} -hda ${HDA} -m ${RAM} -nographic -pidfile qemu.pid"
 echo "Running $QEMU $ARGS < /dev/null"
 exec $QEMU $ARGS < /dev/null