Changeset 1043 in MondoRescue for trunk/tools/build2qemu

Timestamp:

Jan 8, 2007, 11:31:22 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

File:

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

trunk/tools/build2qemu

@@ -6 +6 @@
 #
 
-#if [ _"$1" == _"" ]; then
+#if [ _"$1" = _"" ]; then
     #echo "Syntax: build2qemu [version-tag [vm1]..|vmx]] )"
     #exit -1
 #fi
 
-# Syntax: build2qemu [version-tag [vm1]..|vmx]]
+# Syntax: build2qemu [version-tag [--pkg "pkg1...pkgn"] [vm1]..|vmx]]
 
 (
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
-if [ ${prem} == "/" ]; then
+if [ _${prem} = _"/" ]; then
     export TOOLHOME=$dname
 else
@@ -36 +36 @@
 echo "Working on ${VER}-$TAG"
 
-if [ _"$1" == _"" ]; then
+if [ _"$1" = _"--pkg" ]; then
+    shift
+    c=$1
+    shift
+fi
+
+if [ _"$1" = _"" ]; then
     export VMS=`cat ${TOOLHOME}/DISTROS` 
     single=0
@@ -52 +58 @@
 export TOOLHOME=$TOOLHOME
 
-$TOOLHOME/build2pkg $LAST < /dev/null
-$TOOLHOME/pkg2ftp $LAST
+$TOOLHOME/build2pkg $LAST $c < /dev/null
+$TOOLHOME/pkg2ftp $LAST $c
 EOF
 chmod 755 $MONDOTMP/mkmondo
@@ -68 +74 @@
 
 for m in $VMS; do
+    echo "Working on $m"
     vmp=0
     if [ ! -f /users/qemu/$m.qemu ]; then
@@ -86 +93 @@
     scp -P $sp $MONDOTMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
     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 ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
+    ssh -q -p $sp root@localhost "date $rdate"
+    ssh -q -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
     if [ $vmp -eq 1 ]; then
-        ssh -p $sp root@localhost "halt -p"
+        ssh -q -p $sp root@localhost "halt -p"
         sleep 300
         proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`