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

Timestamp:

Jan 3, 2006, 4:15:54 PM (18 years ago)

Author:

bcornec

Message:

merge -r272:273 $SVN_M/branches/2.06

Location:

trunk/mindi/rootfs/sbin

Files:

• find-and-mount-cdrom (modified) (2 diffs)
• post-init (modified) (3 diffs)

trunk/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -7 +7 @@
     for device in /dev/hd? /dev/scd? /dev/rcd? /dev/sr? /dev/cd? /dev/ide/*/*/*/*/cd /dev/scsi/*/*/*/*/cd; do
         [ ! "$SECOND_TRY" ] && LogIt "Trying $device"
-        if [ "`cat /tmp/mondo-restore.cfg | grep "using-cdstream yes"`" ]; then
+        if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ]; then
         pwd=`pwd`
         cd $GROOVY
@@ -77 +77 @@
 #mount /dev/fd0u1722 -t ext2 /mnt/floppy
 [ "$1" = "--second-try" ] && exit 1; # don't try to mount floppy drive
-if [ "`cat /tmp/mondo-restore.cfg | grep "using-cdstream yes"`" ] ; then
+if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ] ; then
     LogIt "Because you are using cdstream, I won't try to mount CD."
     exit 0

trunk/mindi/rootfs/sbin/post-init

@@ -59 +59 @@
 cat /tmp/mountlist.txt >> /tmp/mondo-restore.log
 
-iso=`cat /proc/cmdline | grep "iso"`
-nuke=`cat /proc/cmdline | grep "nuke"`
+iso=`grep iso /proc/cmdline`
+nuke=`grep nuke /proc/cmdline`
 if [ "$nuke" = "" ] ; then
-    nuke=`cat /proc/cmdline | grep -i "RESTORE "`
+    nuke=`grep -i "RESTORE " /proc/cmdline`
 fi
-expert=`cat /proc/cmdline | grep "expert"`
-compare=`cat /proc/cmdline | grep "compare"`
-interactive=`cat /proc/cmdline | grep "interactive"`
+expert=`grep expert /proc/cmdline`
+compare=`grep compare /proc/cmdline`
+interactive=`grep interactive /proc/cmdline`
 [ "$interactive" ]  && expert=""; # in case 'expert' crops up somewhere
 if which mondorestore > /dev/null 2> /dev/null ; then
@@ -112 +112 @@
     mondorestore --nuke
 elif [ "$expert" ] ; then
-    if [ "`cat /tmp/mondo-restore.cfg | grep tapedev`" ] ; then
+    if [ "`grep tapedev /tmp/mondo-restore.cfg`" ] ; then
     LogIt "-------------------TAPE MODE-------------------" 1
     loc=`which mondorestore 2> /dev/null`
@@ -125 +125 @@
             fi
     fi
-    elif [ "`cat /tmp/mondo-restore.cfg | grep using-cdstream`" ] ; then
+    elif [ "`grep using-cdstream /tmp/mondo-restore.cfg`" ] ; then
         LogIt "------------------CDSTREAM MODE------------------" 1
         loc=`which mondorestore 2> /dev/null`