Changeset 885 in MondoRescue for branches/2.2.0/tools/build2qemu

Timestamp:

Oct 8, 2006, 12:11:38 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r881:884 $SVN_M/branches/stable

File:

• branches/2.2.0/tools/build2qemu (modified) (6 diffs)

branches/2.2.0/tools/build2qemu

@@ -45 +45 @@
 fi
 
-mkdir -p $TMP
-cat > $TMP/mkmondo << EOF
+cat > $MONDOTMP/mkmondo << EOF
 #!/bin/bash
 
@@ -57 +56 @@
 $TOOLHOME/pkg2ftp $LAST
 EOF
-chmod 755 $TMP/mkmondo
+chmod 755 $MONDOTMP/mkmondo
 
 if [ $single -eq 0 ]; then
@@ -63 +62 @@
 fi
 cd $TOOLHOME/..
-tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
+tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $TOPDIR/${VER}-$TAG
 
 for m in $VMS; do
@@ -69 +68 @@
     if [ ! -f /users/qemu/$m.qemu ]; then
             echo "VM unaccessible. Verify NFS mount"
-            rm -rf $TMP
+            rm -rf $MONDOTMP
             exit -1
     fi
@@ -82 +81 @@
         sleep 300
     fi
-    scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
+    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 ; $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
+    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 -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo ; rm -f $MONDOTMP" | tee $MONDOTMP/mkvm.log
     if [ $vmp -eq 1 ]; then
         ssh -p $sp root@localhost "halt -p"
@@ -99 +98 @@
 
 # Should be removed at the end
-rm -rf $TMP
+rm -rf $MONDOTMP
 ) 2>&1 | tee /tmp/build2qemu.log