diff -ur startup-0.9.3.orig/rc.d/rc startup-0.9.3/rc.d/rc --- startup-0.9.3.orig/rc.d/rc 2004-10-03 01:06:56 +0400 +++ startup-0.9.3/rc.d/rc 2005-03-17 16:10:28 +0300 @@ -19,12 +19,16 @@ previous="$1" export runlevel previous + # Get first argument. Set new runlevel to this argument. [ -z "$argv1" ] || runlevel="$argv1" +initsplash + # See if we want to be in user confirmation mode CONFIRM= if [ "$previous" = "N" ]; then + rc_splash start if [ -f /var/run/confirm ] || grep -iwqs confirm /proc/cmdline; then rm -f /var/run/confirm CONFIRM=yes @@ -54,6 +58,8 @@ subsys=${i#/etc/rc.d/rc$runlevel.d/K??} + rc_splash $subsys + # Check if the subsystem is already up. [ -f "/var/lock/subsys/$subsys" -o -f "/var/lock/subsys/$subsys.init" ] || continue @@ -65,6 +71,8 @@ fi done + + # Now run the START scripts. for i in "/etc/rc.d/rc$runlevel.d"/S*; do check_script "$i" || continue @@ -73,7 +81,6 @@ # Check if the subsystem is already up. [ -f "/var/lock/subsys/$subsys" -o -f "/var/lock/subsys/$subsys.init" ] && continue - # If we're in confirmation mode, get user confirmation if [ -n "$CONFIRM" ]; then confirm "$subsys" @@ -83,7 +90,7 @@ *) continue ;; esac fi - + rc_splash $subsys if [ "$subsys" = halt -o "$subsys" = reboot -o "$subsys" = single -o "$subsys" = local ] \ || egrep -qs '(action|daemon|msg_) ' "$i"; then "$i" start @@ -91,3 +98,7 @@ action "Starting $subsys:" "$i" start fi done + +if [[ "$newrunlevel" != "0" && "$newrunlevel" != "6" ]]; then + rc_splash stop +fi diff -ur startup-0.9.3.orig/rc.d/rc.sysinit startup-0.9.3/rc.d/rc.sysinit --- startup-0.9.3.orig/rc.d/rc.sysinit 2005-03-09 16:37:20 +0300 +++ startup-0.9.3/rc.d/rc.sysinit 2005-03-17 17:42:52 +0300 @@ -29,6 +29,7 @@ HOSTNAME=`hostname` + # Read in config data if ! SourceIfNotEmpty /etc/sysconfig/network; then NETWORKING=no @@ -69,6 +70,7 @@ PROMPT= fi + # Mount /proc (done here so volume labels can work with fsck) action "Mounting proc filesystem:" mount -n -t proc proc /proc chgrp proc /proc >/dev/null 2>&1 ||: @@ -77,6 +79,9 @@ if [ "`kernelversion_major`" -eq 2 ] && [ "`kernelversion_minor`" -ge 5 ]; then action "Mounting sys filesystem:" mount -n -t sysfs sysfs /sys fi +initsplash 5 + +rc_splash start 1 # Set the system clock (when /etc/adjtime is missing) [ -s /etc/adjtime ] || /etc/init.d/clock start @@ -181,6 +186,7 @@ fi fi +rc_splash remount 2 # Remount the root filesystem read-write action "Remounting root filesystem in read/write mode:" mount -n -o remount,rw / @@ -222,11 +228,14 @@ fi fi +rc_splash depmod 3 # Load modules where appropriate if [ -x /sbin/depmod ] && is_yes "$USEMODULES"; then INITLOG_ARGS= action "Finding module dependencies:" depmod -A fi +rc_splash kernel 4 + # Configure kernel parameters action "Configuring kernel parameters:" sysctl -e -p /etc/sysctl.conf @@ -349,6 +358,8 @@ # Check filesystems # (pixel) do not check loopback files, will be done later (aren't available yet) if [ -z "$fastboot" ]; then + rc_splash localfs 5 + STRING="Checking filesystems" echo "$STRING" initlog -c "fsck -TRAay -t noloop $fsckoptions" @@ -388,6 +400,7 @@ fi fi +rc_splash mount 6 # 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 @@ -455,6 +469,7 @@ # Language fixes /etc/rc.d/scripts/lang +rc_splash swap 7 # Now turn on swap again (in case we swap to files) action "Activating swap space:" swapon -a @@ -492,6 +507,7 @@ # Update vconfig symlinks for VLAN configuration program ExecIfExecutable /etc/rc.d/scripts/vconfig-update +rc_splash chrooted 8 if [ -x /usr/sbin/update_chrooted ]; then action "Updating chrooted environments:" /usr/sbin/update_chrooted conf lib fi