Changeset 489 in MondoRescue for trunk/tools/mkqemu

Timestamp:

Apr 19, 2006, 11:02:43 AM (18 years ago)

Author:

bcornec

Message:

svn merge -r 463:482 $SVN_M/branches/stable
svn merge -r 485:488 $SVN_M/branches/stable

File:

• trunk/tools/mkqemu (modified) (4 diffs)

trunk/tools/mkqemu

@@ -12 +12 @@
 
 if [ _"$2" == _"" ]; then
-    export SVN_VM="mdk101 mdk102 mdv2006 rhel3 rhel4 rh73 fc4 sles9"
+    export SVN_VM="mdk101 mdk102 mdv2006 rh73 rh9 fc4 fc5 rhel3 rhel4 suse10 sles9 debian31"
 else
     export SVN_VM="$2"
@@ -43 +43 @@
     fi
 fi
-\$SVN_HOME/$1/tools/mkrpm < /dev/null
+echo \$SVN_VM | grep -q "debian"
+if [ \$? -eq 0 ]; then
+    \$SVN_HOME/$1/tools/mkdeb < /dev/null
+else
+    \$SVN_HOME/$1/tools/mkrpm < /dev/null
+fi
 \$SVN_HOME/$1/tools/mkdeliv
 EOF
 
 ipvm=10.0.2.15
+
 
 for m in $SVN_VM; do
@@ -60 +66 @@
         # Virtual machine alreday started
         vmp=1
-        qemu -m 256 -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
-        sleep 240
+        qemu -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/vmplayer/$m.qemu &
+        sleep 300
     fi
     scp -P $sp /tmp/mkmondo bruno@localhost:
@@ -67 +73 @@
     if [ $vmp -eq 1 ]; then
         ssh -p $sp root@localhost "halt -p"
+        sleep 300
+        proces=`ps auxww | grep qemu | grep -v grep | grep -q /users/vmplayer/$m.qemu | awk '{print $2}'`
+        if [ "$proces" != "" ]; then
+            kill $proces
+        fi
     fi
 done