diff -Naupr initscripts-5.49.orig/rc.d/init.d/functions initscripts-5.49/rc.d/init.d/functions --- initscripts-5.49.orig/rc.d/init.d/functions Mon Aug 21 12:00:56 2000 +++ initscripts-5.49/rc.d/init.d/functions Thu Dec 28 19:44:08 2000 @@ -12,6 +12,9 @@ # First set up a default search path. export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin" +# Functions for the boot progress bar +. /etc/rc.d/init.d/pr_functions + # Get a sane screen width [ -z "$COLUMNS" ] && COLUMNS=80 @@ -266,6 +269,7 @@ echo_failure() { [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL echo -n "]" echo -ne "\r" + pr_fail return 1 } @@ -277,6 +281,7 @@ echo_passed() { [ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL echo -n "]" echo -ne "\r" + pr_warn return 1 } diff -Naupr initscripts-5.49.orig/rc.d/rc.sysinit initscripts-5.49/rc.d/rc.sysinit --- initscripts-5.49.orig/rc.d/rc.sysinit Fri Aug 18 17:33:17 2000 +++ initscripts-5.49/rc.d/rc.sysinit Thu Dec 28 19:52:51 2000 @@ -51,10 +51,12 @@ fi # Mount /proc (done here so volume labels can work with fsck) action "Mounting proc filesystem: " mount -n -t proc /proc /proc +pr_set 51 "mounting proc" # Configure kernel parameters action "Configuring kernel parameters: " sysctl -p /etc/sysctl.conf +pr_set 52 "configuring kernel parameters" # Set the system clock. ARC=0 @@ -99,12 +101,14 @@ case "$SRM" in ;; esac +pr_set 53 "setting clock" /sbin/hwclock $CLOCKFLAGS action "Setting clock $CLOCKDEF: `date`" date # Load keymap if [ -x /bin/loadkeys ]; then + pr_set 54 "loading keymap" KEYTABLE= KEYMAP= if [ -f /etc/sysconfig/console/default.kmap ]; then @@ -138,17 +142,21 @@ if [ -x /sbin/setsysfont ]; then -f /etc/sysconfig/console/$SYSFONT.gz -o \ -f /usr/lib/kbd/consolefonts/$SYSFONT.gz ]; then action "Setting default font ($SYSFONT): " /sbin/setsysfont + pr_set 55 "setting default font ($SYSFONT)" fi fi # Start up swapping. +pr_set 56 "activating swap partitions" action "Activating swap partitions: " swapon -a # Set the hostname. +pr_set 59 "setting hostname ${HOSTNAME}" action "Setting hostname ${HOSTNAME}: " hostname ${HOSTNAME} # Set the NIS domain name if [ -n "$NISDOMAIN" ]; then + pr_set 60 "setting NIS domain name $NISDOMAIN" action "Setting NIS domain name $NISDOMAIN: " domainname $NISDOMAIN else domainname "" @@ -159,6 +167,7 @@ usb=0 if ! grep -iq "nousb" /proc/cmdline 2>/dev/null && ! grep -q "usb" /proc/devices 2>/dev/null ; then alias=`egrep -s "^alias[[:space:]]+usb-controller[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'` if [ -n "$alias" -a "$alias" != "off" ] ; then + pr_set 63 "initializing USB controller ($alias)" action "Initializing USB controller ($alias): " modprobe $alias [ $? -eq 0 ] && usb=1 fi @@ -173,9 +182,11 @@ if [ $usb = "1" ]; then action "Initializing USB HID interface: " modprobe hid 2> /dev/null fi if [ -n "$kbdoutput" ]; then + pr_set 63 "initializing USB keyboard" action "Initializing USB keyboard: " modprobe keybdev fi if [ -n "$mouseoutput" ]; then + pr_set 63 "initializing USB mouse" action "Initializing USB mouse: " modprobe mousedev fi fi @@ -208,6 +219,7 @@ if [ -z "$fastboot" -a "$ROOTFSTYPE" != STRING="Checking root filesystem" echo $STRING + pr_set 66 "checking root filesystem" initlog -c "fsck -T -a $fsckoptions /" rc=$? @@ -252,6 +264,7 @@ fi # set up pnp if [ -x /sbin/isapnp -a -f /etc/isapnp.conf ]; then if [ -n "$PNP" ]; then + pr_set 70 "setting up ISA PNP sevices" action "Setting up ISA PNP devices: " /sbin/isapnp /etc/isapnp.conf else action "Skipping ISA PNP configuration at users request: " /bin/true @@ -305,6 +318,7 @@ fi # Update quotas if fsck was run on /. if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then + pr_set 71 "checking root filesystem quotas" action "Checking root filesystem quotas: " /sbin/quotacheck -v / fi @@ -324,6 +338,7 @@ fi rm -f /lib/modules/preferred rm -f /lib/modules/default if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then + pr_set 72 "configuring modules" # If they aren't using a recent sane kernel, make a link for them if [ ! -n "`uname -r | grep -- "-"`" ]; then ktag="`cat /proc/version`" @@ -348,21 +363,25 @@ fi RETURN=0 alias=`egrep -s "^alias[[:space:]]+sound[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'` if [ -n "$alias" -a "$alias" != "off" ] ; then + pr_set 73 "loading sound modules ($alias)" action "Loading sound module ($alias): " modprobe $alias RETURN=$? fi alias=`egrep -s "^alias[[:space:]]+sound-slot-0[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'` if [ -n "$alias" -a "$alias" != "off" ] ; then + pr_set 73 "loading sound modules ($alias)" action "Loading sound module ($alias): " modprobe $alias RETURN=$? fi alias=`egrep -s "^alias[[:space:]]+midi[[:space:]]+" /etc/modules.conf | awk '{ print $3 }'` if [ -n "$alias" -a "$alias" != "off" ]; then + pr_set 73 "loading sound modules ($alias)" action "Loading midi module ($alias): " modprobe $alias fi # Load mixer settings if grep -q "\(sparcaudio\|sound\)" /proc/devices 2>/dev/null && [ $RETURN -eq 0 -a -f /etc/.aumixrc -a -x /bin/aumix-minimal ]; then + pr_set 73 "loading mixer settings" action "Loading mixer settings: " /bin/aumix-minimal -f /etc/.aumixrc -L fi @@ -382,6 +401,7 @@ fi # Add raid devices if [ -f /proc/mdstat -a -f /etc/raidtab ]; then + pr_set 74 "starting up RAID devices" echo -n "Starting up RAID devices: " rc=0 @@ -442,6 +462,7 @@ _RUN_QUOTACHECK=0 if [ -z "$fastboot" ]; then STRING="Checking filesystems" echo $STRING + pr_set 75 "checking filesystems" initlog -c "fsck -T -R -A -a $fsckoptions" rc=$? if [ "$rc" = "0" ]; then @@ -480,6 +501,7 @@ fi action "Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs,proc if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then + pr_set 75 "checking filesystem quotas" action "Checking filesystem quotas: " /sbin/quotacheck -v -R -a fi @@ -520,6 +542,7 @@ if [ -f /.unconfigured ]; then fi if [ -x /sbin/quotaon ]; then + pr_set 75 "turning on user and group quotas for local filesystems" action "Turning on user and group quotas for local filesystems: " /sbin/quotaon -a fi