Ignore:
Timestamp:
Dec 19, 2005, 7:31:56 PM (14 years ago)
Author:
bcornec
Message:

merge -r229:235 $SVN_M/branches/2.05

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/rootfs/sbin/init

    r230 r236  
    649649        # Simulate a local CD
    650650        echo "/mnt/cdrom" > /tmp/CDROM-LIVES-HERE
     651        CD_MOUNTED_OK=yes
    651652    else
    652653            HandleCDROMorFloppies
     
    654655fi
    655656res=$?
    656 echo "Please wait."
    657 insert-all-my-modules > /dev/null &
    658 sleep 7
     657echo "Inserting modules ..."
     658insert-all-my-modules > $LOGFILE 2> $LOGFILE
     659echo "Installing additional tools ..."
    659660install-additional-tools
    660661SwapTheMountExecs
    661662ConfigureLoggingDaemons
    662 echo "Please wait."
    663 insert-all-my-modules &
    664 sleep 7
     663echo "Inserting modules again ..."
     664insert-all-my-modules > $LOGFILE 2> $LOGFILE
    665665if [ -e "/tmp/USE-DEVFS" ] ; then
    666666    umount /mnt/cdrom 2> /dev/null
     
    669669    RunDevfsd
    670670fi
     671echo "Starting potential Raid/LVMs ..."
    671672PauseForRaids
    672673StartRaids
Note: See TracChangeset for help on using the changeset viewer.