Changeset 1983 in MondoRescue for branches/2.2.7/mindi/rootfs/sbin/init

Timestamp:

Jun 16, 2008, 9:40:42 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove aux-tools dir in mindi (either scripts moved or removed)
• Remove isolinux and syslinux static files from mindi. Now generated
• Remove lilo support for ia32 now useless in mindi
• Remoce empty directories in rootfs in mindi
• Remove HackSyslinuxFile, CopyBootBFile, FindLiloBinary, FindSensibleBootBFile, MakeSyslinuxMessageFile, MakeLiloConfFile, ReplaceIndividualLine in mindi
• Adds a single MakeBootConfFile function to dynamiclly create needed conf files in mindi
• Avoids error messages when using only mindi with a non-existant /tmp/mondo-restore.cfg

File:

• branches/2.2.7/mindi/rootfs/sbin/init (modified) (7 diffs)

branches/2.2.7/mindi/rootfs/sbin/init

@@ -104 +104 @@
     cd $GROOVY
     [ "$1" != "" ] && tapedev=$1
-    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
+    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg 2>/dev/null | tr -s ' ' ' ' | cut -d' ' -f2`
     mt -f $tapedev rewind
     mt -f $tapedev fsf 2
@@ -111 +111 @@
     if [ "$res" -eq "0" ] ; then
         # Store the dev name in case we changed it interactively
-        sed -i "s/^media-dev .*$/media-dev  $tapedev/" /tmp/mondo-restore.cfg
-
-        #grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
-        #echo "media-dev $tapedev" >> /tmp/mr.cfg
-        #cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
+        if [ -f "/tmp/mondo-restore.cfg" ]; then
+            sed -i "s/^media-dev .*$/media-dev  $tapedev/" /tmp/mondo-restore.cfg
+        fi
     fi
     cd $old_pwd
@@ -453 +451 @@
     local res
     mount | grep /mnt/cdrom && return 0
-    [ "`grep "backup_media_type" /tmp/mondo-restore.cfg | grep "cdstream"`" ] && return
+    [ "`grep "backup_media_type" /tmp/mondo-restore.cfg 2> /dev/null | grep "cdstream"`" ] && return
     LogIt "Trying to mount CD-ROM a 2nd time..."
     find-and-mount-cdrom --second-try
@@ -594 +592 @@
     export DENY_MODS=" "
 fi
-if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ]; then
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2> /dev/null`" ]; then
     # Do not try to load usb storage when dealing with OBDR it makes the modprobe hang :-(
     export DENY_MODS="usb-storage $DENY_MODS"
@@ -636 +634 @@
 fi
 
-if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i ' udev' /tmp/mondo-restore.cfg`" ]; then
+if [ "`grep -i 'obdr ' /tmp/mondo-restore.cfg 2>/dev/null`" ] || [ "`grep -i ' udev' /tmp/mondo-restore.cfg 2>/dev/null`" ]; then
     HandleTape
     ExtractDataDisksAndLoadModules
@@ -647 +645 @@
     CD_MOUNTED_OK=yes
     ExtractDataDisksAndLoadModules
-elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg | grep media-type`" ]; then
+elif [ "`grep -i usb= /proc/cmdline`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb
 
@@ -718 +716 @@
 dmesg >> $LOGFILE
 
-#-------------------------------
-#ABSORBENTANDYELLOWANDPOROUSISHE#;# --- don't touch this either :)
-#-------------------------------
+ide-opt
 
 #ctrlaltdel soft