Changeset 2182 in MondoRescue for branches

Timestamp:

Apr 30, 2009, 5:49:46 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds support of keyword net t boot prompt to allow network launch (TB tested)
• Fix #331 by forcing nfs mode in case of pxe boot
• Tries to solve udev settle issue reversing the order in which tools are tested (udevadm first then udevsettle)

Location:

branches/2.2.9/mindi

Files:

• README.bootparam (modified) (1 diff)
• rootfs/sbin/init (modified) (3 diffs)

branches/2.2.9/mindi/README.bootparam

@@ -45 +45 @@
     Use that USB device name as the place to look for backup content. The way drivers are loaded may lead that to the fact you have a different device name at restore time, compared to the one you used at backup time, making mondorestore unable to use the right device natively. This helper corrects that. Pass to it the device name, not the partition name. Example: usb=/dev/sdb
 
+net
+    Activate network support
+
 -----------------
 

branches/2.2.9/mindi/rootfs/sbin/init

@@ -304 +304 @@
     fi
     create_dev_makedev
-    if [ -x /sbin/udevsettle ]; then
+    # Newer version use udevadm for that
+    if [ -x /sbin/udevadm ]; then
+            /sbin/udevadm settle
+    elif [ -x /sbin/udevsettle ]; then
         /sbin/udevsettle
     fi
@@ -703 +706 @@
     LogIt "Warning - /tmp/mondo-restore.cfg not found"
 fi
+if [ "`grep -i pxe /proc/cmdline`" ] || [ "`grep -i net /proc/cmdline`" ]; then
+    # We need to get here exported variables from start-nfs
+    . /sbin/start-nfs
+fi
 
 if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' /tmp/mondo-restore.cfg 2>/dev/null`" ]; then
@@ -708 +715 @@
     ExtractDataDisksAndLoadModules
 elif [ "`grep -i pxe /proc/cmdline`" ]; then
-    # We need to get here exported variables from start-nfs
-    . /sbin/start-nfs
-
     # Simulate a local CD
     echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
     CD_MOUNTED_OK=yes
     ExtractDataDisksAndLoadModules
+    # Fake the conf file to force it to NFS mode, even if we made originally a CD (mandatory for mondorestore to work correctly)
+    sed -i "s/backup-media-type.*/backup-media-type nfs/" /tmp/mondo-restore.cfg
 elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb