X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rc.d%2Frc.sysinit;h=a81c4e4a75f88b362f621783ca1085c5f9af265e;hb=refs%2Fheads%2FTOTALNEW;hp=b6b92f769f3286c97bb596e1f708ed4d89122cd6;hpb=458f14b7d1dce39cd18f2ffdde5ea9dc2645d143;p=projects%2Frc-scripts.git

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index b6b92f76..a81c4e4a 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,18 +1,37 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.39 1999/12/15 18:41:06 misiek Exp $
+# $Id: rc.sysinit,v 1.69.2.14 2001/10/25 08:27:05 misiek Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 #
 
+# Rerun ourselves through initlog
+if [ -z "$IN_INITLOG" ]; then
+	[ -f /sbin/initlog ] && exec /sbin/initlog -r /etc/rc.d/rc.sysinit
+fi
+ 
 # Set the path
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
 
+# we need /proc mounted before everything
+mount -n -o gid=17 -t proc /proc /proc
+
+# Choose Hardware profile
+rm -f /var/run/hwprofile 2> /dev/null
+if [ -f /etc/sysconfig/hwprof ]; then
+    . /etc/sysconfig/hwprof
+    if is_yes "${HWPROFILES}" && [ -x /sbin/hwprofile -a -d /etc/sysconfig/hwprofiles/data ]; then
+	mount -n / -o rw,remount
+	/sbin/hwprofile -qf
+	mount -n / -o ro,remount
+    fi
+fi
+
 # NLS
-if [ -f /etc/sysconfig/i18n ]; then
+if [ -r /etc/sysconfig/i18n ]; then
 	. /etc/sysconfig/i18n
 	[ -n "$LANG" ] && export LANG || unset LANG
 	[ -n "$LC_CTYPE" ] && export LC_CTYPE || unset LC_CTYPE
@@ -26,12 +45,11 @@ if [ -f /etc/sysconfig/i18n ]; then
 	[ -n "$LINGUAS" ] && export LINGUAS || unset LINGUAS
 fi
 
-
 # Read functions
 . /etc/rc.d/init.d/functions
 
 # Read network config data.
-if [ -f /etc/sysconfig/network ]; then
+if [ -r /etc/sysconfig/network ]; then
 	. /etc/sysconfig/network
 else
 	NETWORKING=no
@@ -39,40 +57,151 @@ else
 fi
 
 # Read system config data.
-if [ -f /etc/sysconfig/system ]; then
+if [ -r /etc/sysconfig/system ]; then
 	. /etc/sysconfig/system
 else
 	RUN_SULOGIN_ON_ERR=yes
-	RUN_ISAPNP=yes
+	RUN_USERPNP=yes
+	RUN_KERNELPNP=yes
 	PANIC_REBOOT_TIME=0
 	DELAY_LOGIN=yes
 	CLEAN_TMP=no
 	CONSOLE_LOGLEVEL=1
 	LOAD_SOUND=yes
 	SET_SLINKS=yes
+	RUN_LDCONFIG=yes
 fi
 
 # Print welcome message
-echo -e "\t\t\t`termput setaf 6` Powered by `termput setaf 2`PLD/Linux`termput setaf 7`"
+nls "\t\t\t%sPowered by %sPLD GNU/Linux%s" "$(termput setaf 6)" "$(termput setaf 2)" "$(termput setaf 7)"
+if is_yes "$PROMPT"; then
+	nls -n "\t\t     Press %sI%s to enter interactive startup." "$(termput setaf 1)" "$(termput setaf 7)"
+	echo
+	sleep 1
+fi
 
 # Set console loglevel
 /bin/dmesg -n $CONSOLE_LOGLEVEL
 
+# /dev must be also mounted before everything but only if we want use them ;-)
+if is_yes "$MOUNT_DEVFS"; then
+    run_cmd "Mounting Device Filesystem" mount -n -t devfs /dev /dev
+fi
+
+# set up devfsd
+if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then
+	run_cmd "Starting Device Filesystem Daemon" /sbin/devfsd /dev
+fi
+
+# Configure Linux kernel
+run_cmd "Configuring kernel parameters" /sbin/sysctl -p /etc/sysctl.conf
+
+# Set the system clock.
+ARC=0
+SRM=0
+UTC=0
+
+if [ -f /etc/sysconfig/clock ]; then
+   . /etc/sysconfig/clock
+
+   # convert old style clock config to new values
+   if [ "${CLOCKMODE}" = "GMT" ]; then
+      UTC=true
+   elif [ "${CLOCKMODE}" = "ARC" ]; then
+      ARC=true
+   fi
+fi
+
+if grep "system serial" /proc/cpuinfo | grep -q MILO ; then
+   ARC=true
+fi
+
+CLOCKDEF=""
+CLOCKFLAGS="--hctosys"
+
+if is_yes "${UTC}"; then
+    CLOCKFLAGS="${CLOCKFLAGS} --utc";
+    CLOCKDEF="${CLOCKDEF} (utc)";
+else
+    CLOCKFLAGS="${CLOCKFLAGS} --localtime";
+    CLOCKDEF="${CLOCKDEF} (local)";
+fi
+
+if is_yes "${ARC}"; then
+        CLOCKFLAGS="${CLOCKFLAGS} -A";
+        CLOCKDEF="${CLOCKDEF} (arc)";
+fi
+
+if is_yes "${SRM}"; then
+        CLOCKFLAGS="${CLOCKFLAGS} -S";
+        CLOCKDEF="${CLOCKDEF} (srm)";
+fi
+
+# Check if timezone definition is available
+if [ -e /etc/localtime ] ; then
+	if run_cmd "$(nls 'Setting clock')$CLOCKDEF" /sbin/hwclock $CLOCKFLAGS; then
+		show "$(nls 'Today`s date:') $(LC_CTYPE=C date)"; ok
+	fi
+else
+	TIME_SETUP_DELAYED=yes
+fi
+
 # Start up swapping.
-run_cmd "`nls "Activating swap partitions"`" swapon -a
+run_cmd "Activating swap partitions" swapon -a
 
 # Set the hostname.
-run_cmd "`nls "Host:"` ${HOSTNAME}" hostname ${HOSTNAME}
+run_cmd "$(nls 'Host:') ${HOSTNAME}" hostname ${HOSTNAME}
 
 # Set the NIS domain name
 if [ -n "$NISDOMAIN" ]; then
-	run_cmd "`nls "NIS Domain:"` ${NISDOMAIN}" domainname $NISDOMAIN
+	run_cmd "$(nls 'NIS Domain:') ${NISDOMAIN}" domainname $NISDOMAIN
 else
 	domainname ""
 fi
 
+# Initialize USB controller and HID devices
+usb=0
+if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices 2>/dev/null ; then
+    aliases=$(/sbin/modprobe -c | egrep -s "^alias[[:space:]]+usb-controller" | awk '{ print $3 }')
+    if [ -n "$aliases" -a "$aliases" != "off" ] ; then
+      /sbin/modprobe -k usbcore
+      run_cmd "Mounting USB filesystem" mount -t usbdevfs usbdevfs /proc/bus/usb
+      for alias in $aliases ; do 
+        run_cmd "$(nls 'Initializing USB controller') ($alias)" /sbin/modprobe $alias
+      done
+      [ $? -eq 0 -a -n "$aliases" ] && usb=1
+    fi
+fi
+
+if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && grep -q "usb" /proc/devices 2>/dev/null ; then
+  usb=1
+fi
+
+needusbstorage=
+if [ $usb = "1" ]; then
+    sleep 5
+    mouseoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=02")
+    kbdoutput=$(cat /proc/bus/usb/devices 2>/dev/null|grep -E "^I.*Cls=03.*Prot=01")
+    needusbstorage=$(cat /proc/bus/usb/devices 2>/dev/null|grep -e "^I.*Cls=08")
+    if [ -n "$kbdoutput" ] || [ -n "$mouseoutput" ]; then
+        run_cmd "Initializing USB HID interface" /sbin/modprobe hid 2> /dev/null
+    fi
+    if [ -n "$kbdoutput" ]; then
+        run_cmd "Initializing USB keyboard" /sbin/modprobe keybdev
+    fi
+    if [ -n "$mouseoutput" ]; then
+        run_cmd "Initializing USB mouse" /sbin/modprobe mousedev
+    fi
+fi
+
+if [ -f /fastboot ] || grep -iq "fastboot" /proc/cmdline 2> /dev/null ; then
+	fastboot=yes
+else
+	fastboot=
+fi
+
 if [ -f /fsckoptions ]; then
-	fsckoptions=`cat /fsckoptions`
+	fsckoptions=$(cat /fsckoptions)
 else
 	fsckoptions=''
 fi
@@ -81,149 +210,213 @@ if [ -f /forcefsck ]; then
         fsckoptions="-f $fsckoptions"
 fi
 
-# we need /proc mounted before starting fsck
-mount -n -t proc /proc /proc
-
-# Test for NFS Root
-NFSROOT=`cat /proc/mounts | awk '{ if ($2 ~ /^\/$/ && $3 ~ /^nfs$/) print $3 }'`
+if is_yes "$COLOR_INIT"; then
+	fsckoptions="-C $fsckoptions"
+else
+	fsckoptions="-V $fsckoptions"
+fi
 
 _RUN_QUOTACHECK=0
-if [ ! -f /fastboot -a ! -n "$NFSROOT" ]; then
-	show "Checking root filesystems."; started
-	initlog -c "fsck -C -T -a $fsckoptions /"
-
-	rc=$?
-
-	# A return of 2 or higher means there were serious problems.
-	if [ $rc -gt 1 ]; then
-		nls "\n\n*** An error occurred during the file system check.\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
-
-		PS1="`nls "(Repair filesystem) #"`"; export PS1
-		if [ "$RUN_SULOGIN_ON_ERR" = "yes" ]; then
-			sulogin
-		else
-			/bin/sh
-		fi
-
-		run_cmd "Unmounting file systems" umount -a
-		mount -n -o remount,ro /
-		run_cmd "Automatic reboot in progress." reboot
-	elif [ "$rc" = "1" ]; then
-		_RUN_QUOTACHECK=1
-	fi
+_ROOTFS_TYPE=$(grep " / " /proc/mounts | awk '{ print $3 }')
+
+if [ -z "$fastboot" -a "$_ROOTFS_TYPE" != "nfs" -a "$_ROOTFS_TYPE" != "romfs" ]; then 
+    	    show "Checking root filesystems."; started
+	    initlog -c "fsck -T -a $fsckoptions /"
+
+	    rc=$?
+
+	    # A return of 2 or higher means there were serious problems.
+	    if [ $rc -gt 1 ]; then
+		    # don't use '\n' in nls macro !
+		    echo
+		    echo
+		    nls "*** An error occurred during the file system check."
+		    nls "*** Dropping you to a shell; the system will reboot"
+		    nls "*** when you leave the shell."
+		    echo
+
+		    PS1="$(nls '(Repair filesystem)# ')"; export PS1
+		    if is_yes "$RUN_SULOGIN_ON_ERR"; then
+			    sulogin
+		    else
+			    /bin/sh
+		    fi
+
+		    run_cmd "Unmounting file systems" umount -a
+		    mount -n -o remount,ro /
+		    run_cmd "Automatic reboot in progress." reboot
+	    elif [ "$rc" = "1" ]; then
+		    _RUN_QUOTACHECK=1
+	    fi
 fi
 
 # check for arguments 
-if grep -i nopnp /proc/cmdline >/dev/null ; then
+if grep -iq nopnp /proc/cmdline; then
 	PNP=
 else
 	PNP=yes
 fi
 
-# set up pnp 
-if [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
-	if [ -n "$PNP" -a "$RUN_ISAPNP" = "yes" ]; then
-		run_cmd "Setting up ISA PNP devices" /sbin/isapnp /etc/isapnp/isapnp.conf
+# set up pnp and kernel pnp
+if [ -n "$PNP" ]; then
+    if is_yes "$RUN_USERPNP" && [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
+	run_cmd "Setting up ISA PNP devices (userspace pnp)" /sbin/isapnp /etc/isapnp/isapnp.conf
+    fi
+    if is_yes "$RUN_KERNELPNP"; then
+	/sbin/modprobe -k isa-pnp 2> /dev/null
+	if [ -e /proc/isapnp -a -f /etc/isapnp/isapnp-kernel.conf ]; then
+	    show "Setting up ISA PNP devices (kernelspace pnp)"; busy
+	    grep -v "^#" /etc/isapnp/isapnp-kernel.conf > /proc/isapnp && (deltext; ok) || (deltext; fail)
 	fi
+    fi
 fi
 
 # Remount the root filesystem read-write.
 run_cmd "Remounting root filesystem in rw mode" mount -n -o remount,rw /
 
+# Clear mtab
+>/etc/mtab
+
+# Remove stale backups
+rm -f /etc/mtab~ /etc/mtab~~
+
+# Enter root, /proc and (potentially) /proc/bus/usb and devfs into mtab.
+mount -f /
+mount -f /proc
+[ -f /proc/bus/usb/devices ] && mount -f -t usbdevfs usbdevfs /proc/bus/usb
+[ -e /dev/.devfsd ] && mount -f -t devfs devfs /dev 
+
+# Setup hdparm thing (if exists and is needed)
+if ! grep -iq nohdparm /proc/cmdline; then
+	[ -x /etc/rc.d/rc.hdparm ] && /etc/rc.d/rc.hdparm
+fi
+
 # Update quotas if fsck was run on /.
-if [ X"$_RUN_QUOTACHECK" = "X1" -a -x /sbin/quotacheck -a ! -n "$NFSROOT" ]; then
-        run_cmd "Checking root filesystem quotas" /sbin/quotacheck -v /
+if [ "$_RUN_QUOTACHECK" = "1" -a -x /sbin/quotacheck ]; then
+        if [ -x /sbin/convertquota ]; then
+            if [ -f /quota.user ]; then
+                /sbin/convertquota -u / && rm -f /quota.user
+            fi
+            if [ -f /quota.group ]; then
+                /sbin/convertquota -g / && rm -f /quota.group
+            fi
+        fi
+        run_cmd "Checking root filesystem quotas"  /sbin/quotacheck -v /
 fi
 
 # /etc/nologin when starting system
 [ -f /etc/nologin.boot ] && rm -f /etc/nologin /etc/nologin.boot
 
-if [ "$DELAY_LOGIN" = "yes" -a ! -f /etc/nologin ]; then
+if is_yes "$DELAY_LOGIN" && [ ! -f /etc/nologin ]; then
 	show "Enabling Delay Login"; busy
 	echo > /etc/nologin
 	nls "System bootup in progress  - please wait" >> /etc/nologin
 	echo >> /etc/nologin
 	chmod 644 /etc/nologin
 	cp -fp /etc/nologin /etc/nologin.boot
-	deltext; ok
+	ok
 fi
 
-echo ${HOSTNAME} > /etc/HOSTNAME
-
-# Clear mtab
->/etc/mtab
-
-# Enter root and /proc into mtab.
-mount -f /
-mount -f /proc
-
-if ! grep -i nomodules /proc/cmdline >/dev/null && [ -f /proc/ksyms ]; then
+# The root filesystem is now read-write, so we can now log via
+# syslog() directly..
+if [ -n "$IN_INITLOG" ]; then
+    IN_INITLOG=
+fi
+    
+if [ ! -f /proc/modules ]; then
+	USEMODULES=
+elif ! grep -iq nomodules /proc/cmdline; then
 	USEMODULES=y
 else
 	USEMODULES=
 fi
 
-# Kernel dependent links
-rm -f /lib/modules/preferred
-rm -f /lib/modules/default
-if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
- if [ "$SET_SLINKS" != "no" ]; then
-    # Get ready for kmod if module support in the kernel
-    if [ -z `uname -r | grep "-"` ]; then
-       # we're using a new kernel, no preferred needed
-       mver=`uname -r`
-    else
-       ktag="`cat /proc/version`"
-       mtag=grep -l "$ktag" /lib/modules/*/.rhkmvtag 2> /dev/null
-       if [ -n "$mtag" ]; then
-          mver=echo $mtag | sed -e 's,/lib/modules/,,' -e 's,/.rhkmvtag,,' -e 's,[       ].*$,,'
-       fi
-       if [ -n "$mver" ]; then
-         ln -sf /lib/modules/$mver /lib/modules/default
-       fi
+# Adjust symlinks as necessary in /boot to keep system services from
+# spewing messages about mismatched System maps and so on.
+if is_yes "$SET_SLINKS"; then
+    if [ -L /boot/System.map -a -r /boot/System.map-`uname -r` ] ; then
+	ln -s -f System.map-`uname -r` /boot/System.map
     fi
- fi
-    [ -n "$mver" -a -f "/boot/module-info-$mver" ] && ln -sf /boot/module-info-$mver /boot/module-info
-    [ -n "$mver" -a -f "/boot/System.map-$mver" ] && ln -sf /boot/System.map-$mver /boot/System.map
-    show "Finding module dependencies"; busy
-    if (depmod -a 2>&1 | grep -q nresolved) then
-    	deltext; fail; else deltext; ok
+    if [ ! -e /boot/System.map -a -r /boot/System.map-`uname -r` ] ; then
+	ln -s -f System.map-`uname -r` /boot/System.map
     fi
 fi
 
-# load sound modules
-if [ -n "$USEMODULES" -a "$LOAD_SOUND" = "yes" ]; then
-   if grep -s -q "^alias sound" /etc/modules.conf ; then
-      run_cmd "Loading sound module" modprobe -s sound
-   fi
-   if grep -s -q "^alias midi" /etc/modules.conf ; then
-      run_cmd "Loading midi module" modprobe -s midi
-   fi
+# Run depmod if RUN_DEPMOD != "no" and:
+#  a) user requested or RUN_DEPMOD="";
+#  b) modules.dep is missing
+#  c) modules.dep is older than /etc/modules.conf or /lib/modules/$mver
+_RUN_DEPMOD=0
+if ! is_no "$RUN_DEPMOD" && [ -n "$USEMODULES" ]; then
+  is_yes "$RUN_DEPMOD" && _RUN_DEPMOD=1
+  [ "$RUN_DEPMOD" = "ifmissing" -a ! -r /lib/modules/$mver/modules.dep ] && _RUN_DEPMOD=1
+  [ /lib/modules/$mver/modules.dep -ot /etc/modules.conf ] && _RUN_DEPMOD=1
+  [ /lib/modules/$mver/modules.dep -ot /lib/modules/$mver ] && _RUN_DEPMOD=1
+fi
+
+if [ "$_RUN_DEPMOD" = "1" ]; then
+    run_cmd "Finding module dependencies" depmod -a
+fi
+
+# Load sound modules iff they need persistent DMA buffers
+if grep -q "options sound dmabuf=1" /etc/modules.conf 2>/dev/null ; then
+  RETURN=0
+  alias=$(/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound[[:space:]]+" | awk '{ print $3 }')
+  if [ -n "$alias" -a "$alias" != "off" ] ; then
+      run_cmd "$(nls 'Loading sound module') ($alias)" /sbin/modprobe -k $alias
+      RETURN=$?
+  fi
+  alias=$(/sbin/modprobe -c | egrep -s "^alias[[:space:]]+sound-slot-0[[:space:]]+" | awk '{ print $3 }')
+  if [ -n "$alias" -a "$alias" != "off" ] ; then
+      run_cmd "$(nls 'Loading sound module') ($alias)" /sbin/modprobe -k $alias
+      RETURN=$?
+  fi
 fi
 
 if [ -f /proc/sys/kernel/modprobe ]; then
-	# /proc/sys/kernel/modprobe indicates built-in kmod instead
-	echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
+	if [ -n "$USEMODULES" ]; then
+		sysctl -w kernel.modprobe="/sbin/modprobe" >/dev/null 2>&1
+		sysctl -w kernel.hotplug="/sbin/hotplug" >/dev/null 2>&1
+	else
+		# We used to set this to NULL, but that causes
+		# 'failed to exec' messages"
+		sysctl -w kernel.modprobe="/bin/true" >/dev/null 2>&1
+		sysctl -w kernel.hotplug="/bin/true" >/dev/null 2>&1
+	fi
 fi
 
 # Load modules
-if [ -f /etc/rc.d/rc.modules ]; then
-	/etc/rc.d/rc.modules
+if [ -x /etc/rc.d/rc.modules ]; then
+        /etc/rc.d/rc.modules
+fi
+
+# Find and activate volume groups
+modprobe -s lvm-mod >/dev/null 2>&1
+if [ -e /proc/lvm -a -x /sbin/vgscan -a -x /sbin/vgchange -a -e /etc/lvmtab ]; then
+	run_cmd "Scanning for LVM volume groups" /sbin/vgscan && \
+	run_cmd "Activating LVM volume groups" /sbin/vgchange -a y
 fi
 
+# Add raid devices
+if [ ! -f /proc/mdstat ]; then
+        modprobe -s md >/dev/null 2>&1
+fi      
+	
 # Add raid devices
 if [ -f /proc/mdstat -a -f /etc/raidtab ]; then
-	show "Starting up RAID devices."; started
 
 	rc=0
 	
-	for i in `grep "raiddev" /etc/raidtab | awk '{print $2}'`
+	for i in $(grep -v "^#" /etc/raidtab | grep "raiddev" | awk '{print $2}')
 	do
-		RAIDDEV=`basename $i`
-		RAIDSTAT=`grep "^$RAIDDEV : active" /proc/mdstat`
+		RAIDDEV=$(basename $i)
+		RAIDSTAT=$(grep "^$RAIDDEV : active" /proc/mdstat)
+		show "Starting up RAID device %s" $RAIDDEV
+		busy
 		if [ -z "$RAIDSTAT" ]; then
 			# Try raidstart first...if that fails then
-			# fall back to raid0run.
+			# fall back to raid0run and if that fails, too
+			# fall back to raidadd, raidrun.
 			RESULT=1
 			if [ -x /sbin/raidstart ]; then
 				/sbin/raidstart $i
@@ -231,17 +424,36 @@ if [ -f /proc/mdstat -a -f /etc/raidtab ]; then
 			fi
 			if [ $RESULT -gt 0 -a -x /sbin/raid0run ]; then
 				/sbin/raid0run $i
+				RESULT=$?
+			fi
+			if [ $RESULT -gt 0 -a -x /sbin/raidadd -a -x /sbin/raidrun ]; then
+				/sbin/raidadd $i
+				/sbin/raidrun $i
+				RESULT=$?
 			fi
+			if [ $RESULT -gt 0 ]; then
+				rc=1
+				fail
+			else
+				ok
+			fi
+		else
+			ok
 		fi
 	done
 
 	# A non-zero return means there were problems.
 	if [ $rc -gt 0 ]; then
 		show "Starting up RAID devices."; fail
-		nls "\n\n*** An error occurred during the RAID startup\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
-
-		PS1="`nls "(RAID Repair) #"`"; export PS1
-		if [ "$RUN_SULOGIN_ON_ERR" = "yes" ]; then
+		echo
+		echo
+		nls "*** An error occurred during the RAID startup"
+		nls "*** Dropping you to a shell; the system will reboot"
+		nls "*** when you leave the shell."
+		echo
+
+		PS1="$(nls '(RAID Repair)# ')"; export PS1
+		if is_yes "$RUN_SULOGIN_ON_ERR"; then
 			sulogin
 		else
 			/bin/sh
@@ -254,19 +466,25 @@ if [ -f /proc/mdstat -a -f /etc/raidtab ]; then
 	show "Starting up RAID devices."; ok
 fi
 
+_RUN_QUOTACHECK=0
 # Check filesystems
-if [ ! -f /fastboot ]; then
-	show "Checking filesystems."; started
-	initlog -c "fsck -C -T -R -A -a $fsckoptions"
+if [ -z "$fastboot" ] && ! grep -q nofsck /proc/cmdline; then
+	show "Checking filesystems"; started
+	initlog -c "fsck -T -R -A -a $fsckoptions"
 
 	rc=$?
 
 	# A return of 2 or higher means there were serious problems.
 	if [ $rc -gt 1 ]; then
-		nls "\n\n*** An error occurred during the file system check.\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
-
-		PS1="`nls "(Repair filesystem) #"`"; export PS1
-		if [ "$RUN_SULOGIN_ON_ERR" = "yes" ]; then
+		echo
+		echo
+		nls "*** An error occurred during the file system check."
+		nls "*** Dropping you to a shell; the system will reboot"
+		nls "*** when you leave the shell."
+		echo
+
+		PS1="$(nls '(Repair filesystem)# ')"; export PS1
+		if is_yes "$RUN_SULOGIN_ON_ERR"; then
 			sulogin
 		else
 			/bin/sh
@@ -276,50 +494,92 @@ if [ ! -f /fastboot ]; then
 		run_cmd "Remounting root filesystem in ro mode" mount -n -o remount,ro /
 		run_cmd "Automatic reboot in progress." reboot
 	elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
-		run_cmd "Checking filesystem quotas" /sbin/quotacheck -v -R -a
+		_RUN_QUOTACHECK=1
 	fi
 fi
 
 # Mount all other filesystems (except for NFS and /proc, which is already
 # mounted). Contrary to standard usage,
 # filesystems are NOT unmounted in single user mode.
-run_cmd "Mounting local filesystems." mount -a -t nonfs,smbfs,ncpfs,proc
-
-# set the console font
-#if [ -x /sbin/setsysfont ]; then
-#	show "Loading default system font"; busy
-#	if (/sbin/setsysfont > /dev/null 2>&1); then deltext; ok; else deltext; fail; fi
-#fi
+run_cmd "Mounting local filesystems." mount -a -t nonfs,smbfs,ncpfs
+
+if [ "$_RUN_QUOTACHECK" = "1" -a -x /sbin/quotacheck ]; then
+        if [ -x /sbin/convertquota ]; then
+            # try to convert old quotas
+            for mountpt in $(cat /etc/mtab | awk '$4 ~ /quota/{print $2}'); do
+                if [ -f "$mountpt/quota.user" ]; then
+                    /sbin/convertquota -u $mountpt && \
+                        rm -f $mountpt/quota.user
+                fi
+                if [ -f "$mountpt/quota.group" ]; then
+                    /sbin/convertquota -g $mountpt && \
+                        rm -f $mountpt/quota.group
+                fi
+            done
+        fi
+        run_cmd "Checking filesystem quotas"  /sbin/quotacheck -v -R -a
+fi
 
+# Turn on quota
 if [ -x /sbin/quotaon ]; then
-	run_cmd "Turning on quotas for local filesystems" /sbin/quotaon -a
+    run_cmd "Turning on user and group quotas for local filesystems" /sbin/quotaon -a
 fi
 
-# Clean out /etc & /var/{run/*,log/{b,w}tmpx}}.
-rm -f /etc/mtab~ /fastboot /fsckoptions /forcefsck
-rm -f /var/run/utmp  
-:>/var/run/utmpx
-chown root.utmp /var/run/utmpx
-chmod 0664 /var/run/utmpx
+# Turn on process accounting
+if [ -x /sbin/accton ] ; then
+        run_cmd "Turning on process accounting" /sbin/accton /var/log/pacct
+fi
 
-# Clean /tmp
-if [ "$CLEAN_TMP" = "yes" ]; then
-	rm -rf /tmp/*
+# Set the clock if timezone definition wasn't available (eg. /usr not mounted)
+if is_yes "$TIME_SETUP_DELAYED"; then
+	if run_cmd "$(nls 'Setting clock')$CLOCKDEF" /sbin/hwclock $CLOCKFLAGS; then
+		show "$(nls 'Today`s date:') $(LC_CTYPE=C date)"; ok
+	fi
 fi
 
-# Delete UUCP lock files.
-rm -f /var/lock/LCK*
+# Initialize the serial ports.
+if [ -f /etc/rc.d/rc.serial ]; then
+	. /etc/rc.d/rc.serial
+fi
 
-# Delete stale subsystem files.
-rm -f /var/lock/subsys/*
+if [ -f /proc/sys/kernel/panic -a "$PANIC_REBOOT_TIME" -gt "0" ]; then
+	show 'Setting %s seconds for kernel reboot after panic' "$PANIC_REBOOT_TIME"; busy
+	if (sysctl -w kernel.panic=$PANIC_REBOOT_TIME > /dev/null 2>&1); then ok; else fail; fi
+fi
 
-# Delete stale pam_console locks.
-rm -f /var/lock/console/*
-rm -f /var/lock/console.lock
+# Clean out /etc.
+rm -f /fastboot /fsckoptions /forcefsck /halt /poweroff
+
+# Clean up /var
+# I'd use find, but /usr may not be mounted.
+for afile in /var/lock/* /var/run/*; do
+   if [ -d "$afile" ]; then
+	bafile=$(basename $afile)
+	[ "$bafile" != "news" -a "$bafile" != "sudo" -a "$bafile" != "mon" ] && rm -f $afile/*
+   else
+	rm -f $afile
+   fi
+done
+
+{
+# Clean up utmp/wtmp
+rm -f /var/run/utmp?
+if ! is_no "$NEED_XFILES" ; then
+	:>/var/run/utmpx
+	touch /var/log/wtmpx
+	chown root.utmp /var/run/utmpx /var/log/wtmpx
+	chmod 0664 /var/run/utmpx /var/log/wtmpx
+else
+	:>/var/run/utmp
+	touch /var/log/wtmp
+	chown root.utmp /var/run/utmp /var/log/wtmp
+	chmod 0664 /var/run/utmp /var/log/wtmp
+fi
 
-# Delete stale pid files
-rm -f /var/run/*.pid
-rm -f /var/spool/postoffice/.pid.*
+# Clean /tmp
+if is_yes "$CLEAN_TMP"; then
+	rm -rf /tmp/*
+fi
 
 # Delete X locks
 rm -f /tmp/.X*-lock
@@ -327,91 +587,60 @@ rm -f /tmp/.X*-lock
 # Delete Postgres sockets
 rm -f /tmp/.s.PGSQL.*
 
-# Set the system clock.
-show "Setting clock"; busy
-
-ARC=0
-UTC=0
-if [ -f /etc/sysconfig/clock ]; then
-	. /etc/sysconfig/clock
-
-	# convert old style clock config to new values
-	if [ "${CLOCKMODE}" = "GMT" ]; then
-		UTC=true
-	elif [ "${CLOCKMODE}" = "ARC" ]; then
-	    ARC=true
-	fi
-fi
-
-if [ -x /sbin/hwclock ]; then
-	CLOCKFLAGS="--hctosys"
-	CLOCK=/sbin/hwclock
-else
-	CLOCKFLAGS="-a"
-	CLOCK=/sbin/clock
-fi
-
-case "$UTC" in
-  yes|true)
-	CLOCKFLAGS="$CLOCKFLAGS -u";
-#	echo -n " (utc)"
-	;;
-esac
-
-case "$ARC" in
-  yes|true)
-	CLOCKFLAGS="$CLOCKFLAGS -A";
-#	echo -n " (arc)"
-	;;
-esac
-
-#echo -n ": "
-if ($CLOCK $CLOCKFLAGS); then deltext; ok; else deltext; fail; fi
-
-show "`nls "Date set to"` `date`"; ok
-
 # Right, now turn on swap in case we swap to files.
 swapon -a >/dev/null 2>&1
 run_cmd "Enabling swap space" /bin/true
-#show "Enabling swap space"; busy
-#if [ "`LANG=C swapon -a 2>&1 | grep -v "busy"`" = "" ]; then
-#	deltext; ok
-#else
-#	deltext; fail
-#fi
-
-# Initialize the serial ports.
-if [ -f /etc/rc.d/rc.serial ]; then
-	. /etc/rc.d/rc.serial
-fi
 
 # If a SCSI tape has been detected, load the st module unconditionally
 # since many SCSI tapes don't deal well with st being loaded and unloaded
-if [ -f /proc/scsi/scsi ] && cat /proc/scsi/scsi | grep -q 'Type:   Sequential-Access' 2>/dev/null ; then
-	if cat /proc/devices | grep -qv ' 9 st' ; then
-		if [ -n "$USEMODULES" ] ; then
-			# Try to load the module.  If it fails, ignore it...
-			insmod -p st >/dev/null 2>&1 && modprobe -s st >/dev/null 2>&1
-		fi
-	fi
+if [ -f /proc/scsi/scsi ] && grep -q 'Type:   Sequential-Access' /proc/scsi/scsi 2>/dev/null ; then
+        if grep -qv ' 9 st' /proc/devices ; then
+                if [ -n "$USEMODULES" ] ; then
+                        # Try to load the module.  If it fails, ignore it...
+                        insmod -p st >/dev/null 2>&1 && /sbin/modprobe st >/dev/null 2>&1
+                fi
+        fi
 fi
 
-# there could be a new kernel version.  reinit /etc/psdevtab, to be sure.
-rm -f /etc/psdevtab
-#if [ -x /bin/ps ]; then
-#show "Rebuilding /etc/psdevtab database"; busy
-#if (ps > /dev/null 2>&1); then deltext; ok; else deltext; fail; fi
-#fi
+# Load usb storage here, to match most other things
+if [ -n "$needusbstorage" ]; then
+        /sbin/modprobe usb-storage >/dev/null 2>&1
+fi
 
-if ([ -f /proc/sys/kernel/panic -a "$PANIC_REBOOT_TIME" -gt "0" ] 2>/dev/null); then
-show "`nls "Sending val. %s to /proc/sys/kernel/panic" "$PANIC_REBOOT_TIME"`"; busy
-if (echo $PANIC_REBOOT_TIME > /proc/sys/kernel/panic); then deltext; ok; else deltext; fail; fi
+# If they asked for ide-scsi, load it
+if grep -q "ide-scsi" /proc/cmdline ; then
+        /sbin/modprobe -k ide-cd >/dev/null 2>&1
+        /sbin/modprobe -k ide-scsi >/dev/null 2>&1
 fi
 
+# Adjust symlinks as necessary in /boot to keep system services from
+# spewing messages about mismatched System maps and so on.
+if [ -L /boot/System.map -a -r /boot/System.map-`uname -r` ] ; then
+        ln -s -f System.map-`uname -r` /boot/System.map
+fi
+if [ ! -e /boot/System.map -a -r /boot/System.map-`uname -r` ] ; then
+        ln -s -f System.map-`uname -r` /boot/System.map
+fi
+
+# there could be a new kernel version.  remove old psdevtab database
+rm -f /etc/psdevtab
+
 # Now that we have all of our basic modules loaded and the kernel going,
 # let's dump the syslog ring somewhere so we can find it later
 dmesg > /var/log/dmesg
 chmod 640 /var/log/dmesg
+sleep 1
+
+# Now that we have all of our basic modules loaded and the kernel going,
+# let's dump the syslog ring somewhere so we can find it later
+kill -TERM $(/sbin/pidof getkey) >/dev/null 2>&1
+} &
+if is_yes "$PROMPT"; then
+   /sbin/getkey i && touch /var/run/confirm
+fi
+wait
+echo
+
+# This must be last line !
+# vi:syntax=sh:tw=78:ts=8:sw=4
 
-# Feed entropy into the entropy pool
-/etc/rc.d/init.d/random start