From aab610412467f640aec01ac74fbbe93d633aef03 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 7 Apr 2008 08:07:36 +0000
Subject: [PATCH] fix typo

---
 system/TestSsh.py                    |  4 ++--
 system/template-qemu/qemu-start-node | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/system/TestSsh.py b/system/TestSsh.py
index 23d9541..81956b0 100644
--- a/system/TestSsh.py
+++ b/system/TestSsh.py
@@ -121,7 +121,7 @@ class TestSsh:
             return 0
         self.create_buildname_once()
         scp_command="scp "
-        scp_command += TestSh.std_options
+        scp_command += TestSsh.std_options
         if recursive: scp_command += "-r "
         scp_command += self.key_part()
         scp_command += "%s %s:%s/%s"%(local_file,self.hostname_part(),
@@ -135,7 +135,7 @@ class TestSsh:
             command += "%s %s"%(remote_file,local_file)
         else:
             command="scp "
-            command += TestSh.std_options
+            command += TestSsh.std_options
             if recursive: command += "-r "
             command += self.key_part()
             command += "%s:%s/%s %s"%(self.hostname_part(),self.buildname,remote_file,local_file)
diff --git a/system/template-qemu/qemu-start-node b/system/template-qemu/qemu-start-node
index 42c0d2e..c0606f0 100755
--- a/system/template-qemu/qemu-start-node
+++ b/system/template-qemu/qemu-start-node
@@ -4,9 +4,10 @@
 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"
@@ -32,20 +33,20 @@ esac
 #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
-- 
2.43.0