attempt to avoid remote qemus from hanging

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

diff --git a/system/template-qemu/start-qemu-node b/system/template-qemu/start-qemu-node
index ae145c0..b138531 100755 (executable)
--- a/system/template-qemu/start-qemu-node
+++ b/system/template-qemu/start-qemu-node
@@ -4,7 +4,7 @@
 cd $(dirname $0)
 
 #Getting the env. as passed by the test framework - mostly MACADDR and NODE_ISO
-CONFIG=start-qemu.conf
+CONFIG=qemu.conf
 if [ ! -e ${CONFIG} ];then
     echo "File for node_iso version not found"
     exit 1
@@ -13,12 +13,12 @@ fi
 
 #default Value
 #always use the 64 bit version of qemu, as this will work on both 32 & 64 bit host kernels
-QEMU=qemu-system-x86_64
-HDA=hda_10.img
-RAM=520;
+QEMU=qemu
+HDA=hda_5.img
+RAM=1024
 
-SCRIPT=./qemu-ifup
-TAP="tap,script=$SCRIPT";
+SCRIPT=qemu-ifup
+TAP="tap,script=$SCRIPT"
 
 #Creating new HDA if needed only
 #using qcow2 disk image format which is essential to support VM snapshots
@@ -38,7 +38,6 @@ echo "New $HDA is created..."
 rm -f qemu.pid
 
 #Command for running the Qemu Emulator
-ARGS="-boot d  -net nic -net $TAP -cdrom ${NODE_ISO} -hda ${HDA} -m ${RAM} -nographic -pidfile qemu.pid"
-echo $$ > shell.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