various fixes

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

diff --git a/system/template-Qemu/start-qemu-node b/system/template-Qemu/start-qemu-node
old mode 100644 (file)
new mode 100755 (executable)
index bcf17a7..222faa9
--- a/system/template-Qemu/start-qemu-node
+++ b/system/template-Qemu/start-qemu-node
@@ -1,37 +1,44 @@
 #!/bin/bash
 
-#Default Value
-set $(pwd)
-NODE_DIR=$1
-shift $(($# -1))
-CDROM_IMG=${NODE_DIR}/boot_file.iso
-HDA=$NODE_DIR/hda_5.raw;       
-
-#Getting the MAC address
-if [ ! -e "$NODE_DIR/MAC" ];then
+# cd in this command's directory
+cd $(dirname $0)
+
+#Getting the env. as passed by the test framework - mostly MACADDR and NODE_ISO
+CONFIG=start-qemu.conf
+if [ ! -e ${CONFIG} ];then
     echo "File for MAC Address not found"
     exit 1
 fi
-set $(cat $NODE_DIR/MAC)
-MACADDR=$1
-shift $(($# -1))
+. $CONFIG
+
+#default Value
+SCRIPT=./qemu-ifup
+HDA=./FILENAME=hda_5.raw
 
 # qemu parameters
-RAM=320;
-TAP="tap,script=${NODE_DIR}/qemu-ifup";
-echo $NODE_DIR
+RAM=520;
+TAP="tap,script=$SCRIPT";
 #check for the creation of new HDA
 if [ -e "$HDA" ]; then
     echo "Disk already existing removing  it..."
     rm -rf $HDA
 fi
-qemu-img create $HDA 5G
+
+#Creating new HDA
+echo "Creating hard disk for Qemu install under $HDA"
+
+img=$(qemu-img create $FILENAME 10G)
+if [ -z "$img" ];then
+       echo "Can't Create disk image..."
+       exit 1
+fi
+
 echo "New $HDA is created..."
 
 #Command for running the Qemu Emulator
-ARGS="-boot d -cdrom ${CDROM_IMG} -hda ${HDA} -m ${RAM} -net nic,macaddr=${MACADDR} -net $TAP ";
-echo "Executing qemu $ARGS";
+ARGS="-boot d -cdrom ${NODE_ISO} -hda ${HDA} -m ${RAM}  -net nic,macaddr=${MACADDR} -net $TAP -nographic";
+echo "Running qemu $ARGS";
 qemu $ARGS
 
 
-exit
\ No newline at end of file
+exit