From: <ow...@us...> - 2008-05-12 08:06:58
|
Revision: 1355 http://ipcop.svn.sourceforge.net/ipcop/?rev=1355&view=rev Author: owes Date: 2008-05-12 01:07:04 -0700 (Mon, 12 May 2008) Log Message: ----------- Hopefully and finally properly wait for the / parition to come online. This shoudl remove the need for waiting when sd_mod is loaded. Run depmod always, since we are in initramfs (limited number of modules) this takes a very short time. Probably better to run depmod once when initramfs is created. Modified Paths: -------------- ipcop/trunk/config/install/init Modified: ipcop/trunk/config/install/init =================================================================== --- ipcop/trunk/config/install/init 2008-05-12 05:09:26 UTC (rev 1354) +++ ipcop/trunk/config/install/init 2008-05-12 08:07:04 UTC (rev 1355) @@ -34,12 +34,6 @@ BOLD="\\033[1;39m" NORMAL="\\033[0;39m" -# Should we wait for the scsi bus to detect all devices -SCSI_WAIT=no - -# How long (in seconds) should we wait for the scsi bus -SCSI_WAIT_TIME=3 - # The filesystem type of the rootfs ROOT_FSTYPE=ext3 @@ -62,16 +56,16 @@ while [ ! -b ${ROOT} -a ${COUNT} -ge 0 ] do echo -ne "." && sleep 1 - COUNT=$[ ${COUNT} - 1 ] + COUNT=$(( ${COUNT} - 1 )) done - if [ -b ${ROOT} ]; then - echo "Done" - else + if [ ! -b ${ROOT} ]; then echo "Error" # Something's very wrong, go into rescue mode start_rescue_mode fi + + echo "Done" fi echo -ne "Mounting real rootfs ... " @@ -172,18 +166,9 @@ # Create a link from /proc/mounts to /etc/mtab so mke2fs doesn't fail ln -sf /proc/mounts /etc/mtab -if [ x"${MODE}" == x"install" ]; then - # Run depmod to build modules.alias file for hardware detection - # We only do this on fairly modern machines. For older machines we fall back to using the - # included static modules dependencies files. - case ${MACHINE} in - i686|x86_64|ppc|ppc64|sparc64) - echo -ne "Generating module dependencies. This may take some time ... " - depmod -a - echo "Done" - ;; - esac -fi +echo -ne "Generating module dependencies ... " +depmod -a +echo "Done" # This is important and it eliminates the need to use udevstart to discover new # devices after we've loaded a module. And since we're including LFS udev rules @@ -207,12 +192,6 @@ for MODULE in `cat /etc/modules.conf`; do echo -ne "Loading module ${MODULE} ... " /sbin/modprobe ${MODULE} - - # scsi bus sometimes takes a few seconds to scan all devices - if [ x"${MODULE}" == x"sd_mod" ]; then - SCSI_WAIT=yes - fi - echo "Done" done @@ -234,15 +213,6 @@ # Now that we know what our tty is, fix /etc/inittab sed -i -e "s,CURRENT_TTY,${CURRENT_TTY},g" /etc/inittab -# If we loaded sd_mod, wait 3 seconds -if [ x"${SCSI_WAIT}" == x"yes" ]; then - echo -ne "Giving the scsi bus ${SCSI_WAIT_TIME} seconds to scan all devices ... " - sleep ${SCSI_WAIT_TIME} - echo "Done" -fi - - - case ${MODE} in normal) start_normal_mode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |