Changeset 1903 in MondoRescue for branches/stable/mindi/rootfs/sbin

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

Location:

branches/stable/mindi/rootfs/sbin

Files:

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

branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -25 +25 @@
         fi
         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
-               [ ! "$SECOND_TRY" ] && LogIt "It's not in $device; I'll keep looking"
-            fi
-            continue
-    fi
-    LogIt "$device has a CD-ROM in it"
-    umount /mnt/cdrom
-    ln -sf $device /dev/cdrom
-    if [ "$?" -ne "0" ]; then
-        LogIt "Unable to softlink $device to /dev/cdrom. That's weird."
-        continue
-    fi
+            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
+                [ ! "$SECOND_TRY" ] && LogIt "It's not in $device; I'll keep looking"
+            fi
+            continue
+        fi
+        LogIt "$device has a CD-ROM in it"
+        umount /mnt/cdrom
+        ln -sf $device /dev/cdrom
+        if [ "$?" -ne "0" ]; then
+            LogIt "Unable to softlink $device to /dev/cdrom. That's weird."
+            continue
+        fi
         LogIt "CD-ROM found at $device"
-        mount /mnt/cdrom
+        mount $device -t iso9660 -o ro /mnt/cdrom 2> /tmp/mount.log
         if [ "$?" -ne "0" ] ; then
-            LogIt "Cannot mount /dev/cdrom (type $format) (dev=$device)"
+            LogIt "Cannot mount /dev/cdrom (type iso9660) (dev=$device)"
             continue
         elif [ ! -d "/mnt/cdrom/archives" ] ; then
@@ -51 +51 @@
             LogIt "$device is where the Mondo CD lives."
             which hdparm > /dev/null 2> /dev/null && hdparm -u1 -c3 -d1 $device
-        return 0
-    fi
+            return 0
+        fi
     done
     LogIt "Failed to find CD-ROM"
@@ -80 +80 @@
     exit 0
 fi
+
+LogIt "Unable to find and mount your CD-ROM" 1
+LogIt "You probably miss the correct driver to support your CD-ROM drive" 1
+exit 2

branches/stable/mindi/rootfs/sbin/init

@@ -124 +124 @@
         LogIt "$tapedev failed to act as extended data disk for booting." 1
         LogIt "Please specify an alternate tape device," 1
-        LogIt "or hit <Enter> to boot from CD/floppies." 1
+        LogIt "or hit <Enter> to boot from another media." 1
         echo -en "---> "
         read tapedev
@@ -140 +140 @@
     if [ "$res" -ne "0" ] ; then
         cd /
-        LogIt "Failed to use tape as extended datadisk. Reverting to cd." 1
+        LogIt "Failed to use tape as extended datadisk. Reverting to another media." 1
         HandleCDROM
         res=$?
@@ -155 +155 @@
 
 
-HHandleCDROM() {
+HandleCDROM() {
     # Just in case we have an iLO ensure we will map it correctly
     echo "$DENY_MODS" | grep -q "usb-storage "
@@ -186 +186 @@
         LogIt "OK, I am running on a CD-ROM. Good." 3
         CD_MOUNTED_OK=yes
-    elif [ "$res" -eq "1" ] ; then
-        LogIt "OK, I am running on floppies. Good." 3
-        CD_MOUNTED_OK=""
-    else
-        LogIt "OK, I am falling back to floppy mode." 3
-        LogIt "(You may not have the right drivers" 3
-        LogIt "to support the hardware on which we are running)" 3
-        LogIt "That means you'll have to copy the data disk images from" 3
-        LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
-        LogIt "insert them, one after the other. Please see the manual." 3
-        LogIt "The images are in /images on the CD, or /root/images/mindi" 3
-        LogIt "on your hard disk. Your archives are probably fine but" 3
-        LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
+    else
+        LogIt "You probably not have the right drivers" 3
+        LogIt "to support the hardware on which we are running" 3
+        LogIt "Your archives are probably fine but" 3
+        LogIt "your tape streamer and/or CD-ROM drive are unsupported at that point." 3
         CD_MOUNTED_OK=""
     fi
@@ -316 +308 @@
     # Depending on udevd version it gives back the hand or not :-(
     /sbin/udevd --daemon &
-    sleep 2
+    sleep 5
     mkdir -p /dev/.udev/queue/
     if [ -x /sbin/udevtrigger ]; then
@@ -619 +611 @@
 mount -o remount rw /
 [ ! "$GROOVY" ] && Die "I'm not groovy!"
-for i in $GROOVY /mnt/floppy /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
+for i in $GROOVY /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
     mkdir -p $i
 done
@@ -781 +773 @@
 else
     LogIt "backup-media-type is not specified in config file."
-    LogIt "I think this CD/floppy has no archives on it."
+    LogIt "I think this media has no archives on it."
 fi
 if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then

branches/stable/mindi/rootfs/sbin/untar

@@ -14 +14 @@
 # ---------------------- main ----------------------
 
-mountpoint=/mnt/floppy
+mountpoint=/dev/null
 [ -e "/tmp/CDROM-LIVES-HERE" ] && mountpoint=/mnt/cdrom/images
 [ "$#" -eq "2" ] || Die "untar <tarball> <untar_to>"
@@ -22 +22 @@
 if [ -e "/tmp/CDROM-LIVES-HERE" ] ; then
     [ -e "$tarball" ] || LogIt "Can't find CD's $tarball" 1
-else
-    while [ ! -f "$tarball" ] ; do
-        echo -e -n "Please insert data (floppy) disk #$diskno and press ENTER."
-        read line
-        mount /dev/fd0 -t ext2 -o ro $mountpoint
-        [ -f "$tarball" ] || umount $mountpoint ; # unmount if tarball not on disk
-        echo -en "Working..."
-    done
 fi