Changeset 149 in MondoRescue for trunk/mindi/rootfs/sbin

Timestamp:

Dec 3, 2005, 11:38:14 PM (19 years ago)

Author:

bcornec

Message:

merge -r144:148 $SVN_M/branches/2.05

File:

• trunk/mindi/rootfs/sbin/init (modified) (1 diff)

trunk/mindi/rootfs/sbin/init

@@ -622 +622 @@
 #    HandleCDROMorFloppies
 #el
-if [ "`cat /tmp/mondo-restore.cfg | grep "tape "`" ] || [ "`cat /tmp/mondo-restore.cfg | grep udev`" ] ; then
+if [ "`| grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ] ; then
     HandleTape
 else
-    if [ "`cat /proc/cmdline | grep -i pxe`" ] ; then
+    if [ "`cat /proc/cmdline | grep -i pxe`" ] || [ "`grep -i iso-prefix /tmp/mondo-restore.cfg`" ] ; then
         LogIt "PXE boot found"
-        imgname="mondorescue"
+        imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+        if [ "$imgname" = "" ]; then
+            imgname="mondorescue"
+        fi
         if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
-            for i in "`cat /proc/cmdline`" ; do
+            for i in `cat /proc/cmdline` ; do
                 if [ "`echo $i | grep -i prefix`" ] ; then
                     imgname=`echo $i | cut -d'=' -f2`