Changeset 1903 in MondoRescue for branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom

Timestamp:

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

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom (modified) (3 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