Changeset 26 in MondoRescue for trunk

Timestamp:

Sep 19, 2005, 7:50:34 PM (19 years ago)

Author:

bcornec

Message:

Corrects bug 005083 (PXE and -p option incompatible)

Location:

trunk

Files:

• mindi/README.pxe (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/ChangeLog (modified) (1 diff)

trunk/mindi/README.pxe

@@ -9 +9 @@
 mondo
         kernel vmlinuz-mondo
-        initrd initrd-mondo pxe ...
+        initrd initrd-mondo pxe [prefix="machine"] ...
 
 Thus the PXE ROM will boot mondo's kernel and mondo's initrd in memory and will append all the right configuration options (as you find in syslinux.cfg on the mindi's floppy image) to which you need to add the keyword pxe.
 (You need to have backup your data using the NFS option of mondoarchive)
+If you used the -p option of mondoarchive, you'll have to specify the real name of mondo images to use during restore. To do that use prefix=machine on the initrd line, after the pxe keyword, to load the ISO images saved with -p machine.
+Without prefix keyword, images name mondorescue-1.iso, ... will be used.
 
 During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media.

trunk/mindi/rootfs/sbin/init

@@ -625 +625 @@
     HandleTape
 else
-    if [ "`cat /proc/cmdline | grep -i "pxe"`" ] ; then
+    if [ "`cat /proc/cmdline | grep -i pxe`" ] ; then
         LogIt "PXE boot found"
-        LogIt "Mounting NFS image 1.iso on /mnt/cdrom in loopback"
-        losetup /dev/loop7 /tmp/isodir/1.iso
+        imgname="mondorescue"
+        if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
+            for i in "`cat /proc/cmdline`" do
+                if [ "`echo $i | grep -i prefix`" ] ; then
+                    imgname=`echo $i | cut -d'=' -f2`
+                fi
+            done
+        fi
+        LogIt "Mounting NFS image $imgname.iso on /mnt/cdrom in loopback"
+        losetup /dev/loop7 /tmp/isodir/$imgname.iso
         mount -t iso9660 /dev/loop7 /mnt/cdrom
         # Simulate a local CD

trunk/mondo/ChangeLog

@@ -4 +4 @@
 v2.04_berlios (Bruno Cornec <bcornec@users.berlios.de)
 - Add -p option to generate ISO images file names with prefix. The new default
-  name for ISO images is mondorescue-1.iso, ...
+  name for ISO images is mondorescue-1.iso, ... For PXE environment, you have
+  to use the prefix option on the command line (read README.pxe)
 - Mandrake 2005 support
 - NFS patches (Yann Aubert <technique@alixen.fr>)