# HG changeset patch # User Christophe Lincoln # Date 1301299938 -7200 # Node ID 0afa5677578486bb3f00be95badfa55d9b4e8c5f # Parent 8e9696298282c0956bfc5eb16643e64bac62c572 rcS: Improve fbsplash (from last revert...) diff -r 8e9696298282 -r 0afa56775784 etc/init.d/rcS --- a/etc/init.d/rcS Sun Mar 27 01:46:40 2011 +0100 +++ b/etc/init.d/rcS Mon Mar 28 10:12:18 2011 +0200 @@ -11,17 +11,17 @@ # Boot time. bootdate=`date +%s` +if [ "$1" != "logged" ]; then # logged + # Graphical boot start. if [ "$FBSPLASH" == "yes" ]; then reset && fbsplash -c \ -s /etc/fbsplash/$FBSPLASH_THEME/fbsplash.ppm \ -i /etc/fbsplash/$FBSPLASH_THEME/fbsplash.cfg \ -f /etc/fbsplash/fifo & - echo "0" > /etc/fbsplash/fifo + echo "0" > /etc/fbsplash/fifo && sleep 1 fi -if [ "$1" != "logged" ]; then # logged - echo "Processing /etc/init.d/rcS..." # Mount /proc. @@ -227,6 +227,8 @@ /sbin/tazhw init fi +[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo + # Call udevadm trigger to ensure /dev is fully populate now that all # modules are loaded. if [ "$UDEV" = "yes" ]; then @@ -244,7 +246,7 @@ fi done -[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo +[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo # Re-source main config file. In Live mode, daemons list can be modified # by boot options (screen=text will remove slim). @@ -259,7 +261,7 @@ fi done -[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo +[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo # Back to a verbose mode. echo "7 4 1 7" > /proc/sys/kernel/printk @@ -270,8 +272,6 @@ echo -e "\033[1m$MESSAGE\033[0m" fi -[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo - # Display and log boot time. time=$((`date +%s` - $bootdate)) echo $time > /var/log/boot-time