Changeset 1106 in MondoRescue for trunk/mindi/rootfs

Timestamp:

Feb 7, 2007, 11:55:11 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

Location:

trunk/mindi/rootfs/sbin

Files:

• find-and-mount-cdrom (modified) (1 diff)
• init (modified) (1 diff)

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

@@ -8 +8 @@
         [ ! "$SECOND_TRY" ] && LogIt "Trying $device"
         if [ "`grep "using-cdstream yes" /tmp/mondo-restore.cfg`" ]; then
-        pwd=`pwd`
-        cd $GROOVY
+            pwd=`pwd`
+            cd $GROOVY
             tar -zxf $device 2> /tmp/mount.log
             res=$?
-        cd $pwd
+            cd $pwd
             if [ "$res" -eq "0" ] ; then
-        clear
-               LogIt "Using cdstream as extended datadisk ($device). Good." 3
-        echo "Using cdstrea as extd dsk." > /tmp/TAPEDEV-HAS-DATA-DISKS
-                ln -sf $device /dev/cdrom
-                exit 0
-        fi
+                clear
+                LogIt "Using cdstream as extended datadisk ($device). Good." 3
+                echo "Using cdstream as extd dsk." > /tmp/TAPEDEV-HAS-DATA-DISKS
+                ln -sf $device /dev/cdrom
+                exit 0
+            fi
         else
             mount $device -t iso9660 -o ro /mnt/cdrom 2> /tmp/mount.log
-        res=$?
+            res=$?
         fi
-    if [ "$res" -ne "0" ] ; then
-        res=`cat /tmp/mount.log`
-        if [ "$res" = "mount: No medium found" ] ; then
+        if [ "$res" -ne "0" ] ; then
+            res=`cat /tmp/mount.log`
+            if [ "$res" = "mount: No medium found" ] ; then
                [ ! "$SECOND_TRY" ] && LogIt "There is a CD-ROM drive at $device but no CD in it."
-        else
+            else
                [ ! "$SECOND_TRY" ] && LogIt "It's not in $device; I'll keep looking"
-        fi
-        continue
+            fi
+            continue
     fi
     LogIt "$device has a CD-ROM in it"

trunk/mindi/rootfs/sbin/init

@@ -83 +83 @@
 LoadKeymap() {
     local fname
-    fname=`cat /tmp/KEYMAP-LIVES-HERE 2> /dev/null`
+    fname=`grep keymap-lives-here /tmp/mondo-restore.cfg | cut -d' ' -f2 2> /dev/null`
     [ "$fname" = "" ] && return
     if which loadkeys > /dev/null 2> /dev/null ; then