Ignore:
Timestamp:
Apr 10, 2008, 1:13:58 AM (11 years ago)
Author:
bruno
Message:

merge -r 1842:1889 2.2.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/rootfs/sbin/init

    r1842 r1903  
    124124        LogIt "$tapedev failed to act as extended data disk for booting." 1
    125125        LogIt "Please specify an alternate tape device," 1
    126         LogIt "or hit <Enter> to boot from CD/floppies." 1
     126        LogIt "or hit <Enter> to boot from another media." 1
    127127        echo -en "---> "
    128128        read tapedev
     
    140140    if [ "$res" -ne "0" ] ; then
    141141        cd /
    142         LogIt "Failed to use tape as extended datadisk. Reverting to cd." 1
     142        LogIt "Failed to use tape as extended datadisk. Reverting to another media." 1
    143143        HandleCDROM
    144144        res=$?
     
    155155
    156156
    157 HHandleCDROM() {
     157HandleCDROM() {
    158158    # Just in case we have an iLO ensure we will map it correctly
    159159    echo "$DENY_MODS" | grep -q "usb-storage "
     
    186186        LogIt "OK, I am running on a CD-ROM. Good." 3
    187187        CD_MOUNTED_OK=yes
    188     elif [ "$res" -eq "1" ] ; then
    189         LogIt "OK, I am running on floppies. Good." 3
    190         CD_MOUNTED_OK=""
    191     else
    192         LogIt "OK, I am falling back to floppy mode." 3
    193         LogIt "(You may not have the right drivers" 3
    194         LogIt "to support the hardware on which we are running)" 3
    195         LogIt "That means you'll have to copy the data disk images from" 3
    196         LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
    197         LogIt "insert them, one after the other. Please see the manual." 3
    198         LogIt "The images are in /images on the CD, or /root/images/mindi" 3
    199         LogIt "on your hard disk. Your archives are probably fine but" 3
    200         LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
     188    else
     189        LogIt "You probably not have the right drivers" 3
     190        LogIt "to support the hardware on which we are running" 3
     191        LogIt "Your archives are probably fine but" 3
     192        LogIt "your tape streamer and/or CD-ROM drive are unsupported at that point." 3
    201193        CD_MOUNTED_OK=""
    202194    fi
     
    316308    # Depending on udevd version it gives back the hand or not :-(
    317309    /sbin/udevd --daemon &
    318     sleep 2
     310    sleep 5
    319311    mkdir -p /dev/.udev/queue/
    320312    if [ -x /sbin/udevtrigger ]; then
     
    619611mount -o remount rw /
    620612[ ! "$GROOVY" ] && Die "I'm not groovy!"
    621 for i in $GROOVY /mnt/floppy /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
     613for i in $GROOVY /mnt/cdrom /mnt/isodir /var/local/petris /tmp/isodir; do
    622614    mkdir -p $i
    623615done
     
    781773else
    782774    LogIt "backup-media-type is not specified in config file."
    783     LogIt "I think this CD/floppy has no archives on it."
     775    LogIt "I think this media has no archives on it."
    784776fi
    785777if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
Note: See TracChangeset for help on using the changeset viewer.