Changeset 1888


Ignore:
Timestamp:
Mar 5, 2008, 3:24:30 AM (12 years ago)
Author:
bruno
Message:

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

Location:
branches/2.2.5/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1885 r1888  
    6262
    6363# ide-probe-mod
    64 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"
     64IDE_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"
    6565PCMCIA_MODS="pcmcia_core ds yenta_socket"
    6666USB_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

    r1885 r1888  
    2424            res=$?
    2525        fi
    26     if [ "$res" -ne "0" ] ; then
    27         res=`cat /tmp/mount.log`
    28         if [ "$res" = "mount: No medium found" ] ; then
    29                [ ! "$SECOND_TRY" ] && LogIt "There is a CD-ROM drive at $device but no CD in it."
    30         else
    31                [ ! "$SECOND_TRY" ] && LogIt "It's not in $device; I'll keep looking"
     26        if [ "$res" -ne "0" ] ; then
     27            res=`cat /tmp/mount.log`
     28            if [ "$res" = "mount: No medium found" ] ; then
     29                [ ! "$SECOND_TRY" ] && LogIt "There is a CD-ROM drive at $device but no CD in it."
     30            else
     31                [ ! "$SECOND_TRY" ] && LogIt "It's not in $device; I'll keep looking"
     32            fi
     33            continue
    3234        fi
    33         continue
    34     fi
    35     LogIt "$device has a CD-ROM in it"
    36     umount /mnt/cdrom
    37     ln -sf $device /dev/cdrom
    38     if [ "$?" -ne "0" ]; then
    39         LogIt "Unable to softlink $device to /dev/cdrom. That's weird."
    40         continue
    41     fi
     35        LogIt "$device has a CD-ROM in it"
     36        umount /mnt/cdrom
     37        ln -sf $device /dev/cdrom
     38        if [ "$?" -ne "0" ]; then
     39            LogIt "Unable to softlink $device to /dev/cdrom. That's weird."
     40            continue
     41        fi
    4242        LogIt "CD-ROM found at $device"
    43         mount /mnt/cdrom
     43        mount $device -t iso9660 -o ro /mnt/cdrom 2> /tmp/mount.log
    4444        if [ "$?" -ne "0" ] ; then
    45             LogIt "Cannot mount /dev/cdrom (type $format) (dev=$device)"
     45            LogIt "Cannot mount /dev/cdrom (type iso9660) (dev=$device)"
    4646            continue
    4747        elif [ ! -d "/mnt/cdrom/archives" ] ; then
     
    5151            LogIt "$device is where the Mondo CD lives."
    5252            which hdparm > /dev/null 2> /dev/null && hdparm -u1 -c3 -d1 $device
    53         return 0
    54     fi
     53            return 0
     54        fi
    5555    done
    5656    LogIt "Failed to find CD-ROM"
Note: See TracChangeset for help on using the changeset viewer.