Changeset 2811 in MondoRescue for branches/2.2.8/mindi/rootfs/sbin/init

Timestamp:

Apr 29, 2011, 3:39:47 PM (13 years ago)

Author:

Bruno Cornec

Message:

r2183@localhost (orig r2182): bruno | 2009-04-30 17:49:46 +0200

• 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)

File:

• branches/2.2.8/mindi/rootfs/sbin/init (modified) (3 diffs)

branches/2.2.8/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