Changeset 1340 in MondoRescue

Timestamp:

Apr 25, 2007, 12:25:28 AM (18 years ago)

Author:

Bruno Cornec

Message:

Merging modifs from 2.2.2 on tools

Location:

branches/stable/tools

Files:

• mkqemu (modified) (1 diff)
• test2qemu (modified) (1 diff)

branches/stable/tools/mkqemu

@@ -25 +25 @@
 fi
 
-$qemucmd -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
+if [ _"$QEMUAPP" != _"" ]; then
+    $qemucmd -m 256 $QEMUOPT -append "$QEMUAPP" -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
+else
+    $qemucmd -m 256 $QEMUOPT -redir tcp:${sp}:${ipvm}:22 /users/qemu/$m.qemu
+fi
 ) 2>&1 | tee /tmp/mkqemu.log

branches/stable/tools/test2qemu

@@ -42 +42 @@
         vmp=1
         sudo mkdir -p /pub/users/svg/mnt
-        sudo mount -o loop /pub/users/svg/mondo/images/test-mondo-$m /pub/users/svg/mnt
-        cp -a /pub/users/svg/mnt/vmlinuz /users/qemu/pxe/$m
-        cp -a /pub/users/svg/mnt/initrd.img /users/qemu/pxe/$m.img
+        sudo mount -o loop /pub/users/svg/mondo/images/test-mondo-$m-1.iso /pub/users/svg/mnt
+        sudo cp -a /pub/users/svg/mnt/vmlinuz /users/qemu/pxe/$m
+        sudo cp -a /pub/users/svg/mnt/initrd.img /users/qemu/pxe/$m.img
         sudo umount /pub/users/svg/mnt
         cp /users/qemu/pxe.qemu /users/qemu/pxe-$m.qemu
-        export QEMUOPT="-kernel /users/qemu/pxe/$m -initrd /users/qemu/pxe/$m.img -append 'load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=65536 rw root=/dev/ram iso_mode pxe prefix=test-mondo-$m ipconf=eth0:dhcp nfsmount=flecha.home.musique-ancienne.org:/users/svg/mondo/images'"
+        set -x
+        export QEMUOPT="-kernel /users/qemu/pxe/$m -initrd /users/qemu/pxe/$m.img"
+        export QEMUAPP="load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=65536 rw root=/dev/ram iso_mode nuke pxe prefix=test-mondo-$m ipconf=eth0:dhcp nfsmount=192.168.8.55:/users/svg"
+        #nfsmount=flecha.home.musique-ancienne.org:/users/svg/mondo/images
         # ramdisk_blocksize=1024
         $TOOLHOME/mkqemu pxe-$m &
-        sleep 300
+        sleep 2000
     fi
-    ssh -q -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/test-mondo.tar.gz ; $MONDOTMP/test-mondo " | tee $MONDOTMP/mkvm.log
     if [ $vmp -eq 1 ]; then
         ssh -q -p $sp root@localhost "halt -p"