Changeset 600 in MondoRescue for trunk/tools/build2qemu

Timestamp:

May 31, 2006, 12:22:14 AM (18 years ago)

Author:

bcornec

Message:

merge -r 591:599 $SVN_M/branches/stable

File:

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

trunk/tools/build2qemu

@@ -39 +39 @@
 if [ _"$1" == _"" ]; then
     export VMS=`cat ${TOOLHOME}/DISTROS` 
+    single=0
 else
-    export VMS="$1"
+    export VMS="$*"
+    single=1
 fi
 
@@ -52 +54 @@
 export TOOLHOME=$TOOLHOME
 
-$TOOLHOME/build2pkg $LAST
-$TOOLHOME/pkg2ftp
+$TOOLHOME/build2pkg $LAST < /dev/null
+$TOOLHOME/pkg2ftp $LAST
 EOF
 chmod 755 $TMP/mkmondo
 
-$TOOLHOME/files2ftp
+if [ $single -eq 0 ]; then
+    $TOOLHOME/file2ftp
+fi
 cd $TOOLHOME/..
 tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
@@ -68 +72 @@
             exit -1
     fi
+    export sp=2222
     ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
-    export sp=2222
     if [ $? -ne 0 ]; then
         # Virtual machine alreday started
@@ -77 +81 @@
     fi
     scp -P $sp $TMP/mkmondo.tar.gz bruno@localhost:
-    ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
+    rdate=`date "+%m%d%H%M"`
+    ssh -p $sp root@localhost "date $rdate"
+    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
     #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
     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/qemu/$m.qemu | awk '{print $2}'`
+        proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`
         if [ "$proces" != "" ]; then
             kill $proces