Changeset 1888 in MondoRescue

Timestamp:

Mar 5, 2008, 3:24:30 AM (17 years ago)

Author:

Bruno Cornec

Message:

Attempt again to fix #172 (fix from Angelo Pozzi angelo_mose.pozzi_at_alcatel-lucent.it)

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (1 diff)
• rootfs/sbin/find-and-mount-cdrom (modified) (2 diffs)

branches/2.2.5/mindi/mindi

@@ -62 +62 @@
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual"

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

@@ -24 +24 @@
             res=$?
         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"
+        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
-        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 "$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"