slitaz-boot-scripts rev 246
rcS: Improve fbsplash (from last revert...)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Mar 28 10:12:18 2011 +0200 (2011-03-28) |
parents | 8e9696298282 |
children | d970012328a4 |
files | etc/init.d/rcS |
line diff
1.1 --- a/etc/init.d/rcS Sun Mar 27 01:46:40 2011 +0100 1.2 +++ b/etc/init.d/rcS Mon Mar 28 10:12:18 2011 +0200 1.3 @@ -11,17 +11,17 @@ 1.4 # Boot time. 1.5 bootdate=`date +%s` 1.6 1.7 +if [ "$1" != "logged" ]; then # logged 1.8 + 1.9 # Graphical boot start. 1.10 if [ "$FBSPLASH" == "yes" ]; then 1.11 reset && fbsplash -c \ 1.12 -s /etc/fbsplash/$FBSPLASH_THEME/fbsplash.ppm \ 1.13 -i /etc/fbsplash/$FBSPLASH_THEME/fbsplash.cfg \ 1.14 -f /etc/fbsplash/fifo & 1.15 - echo "0" > /etc/fbsplash/fifo 1.16 + echo "0" > /etc/fbsplash/fifo && sleep 1 1.17 fi 1.18 1.19 -if [ "$1" != "logged" ]; then # logged 1.20 - 1.21 echo "Processing /etc/init.d/rcS..." 1.22 1.23 # Mount /proc. 1.24 @@ -227,6 +227,8 @@ 1.25 /sbin/tazhw init 1.26 fi 1.27 1.28 +[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo 1.29 + 1.30 # Call udevadm trigger to ensure /dev is fully populate now that all 1.31 # modules are loaded. 1.32 if [ "$UDEV" = "yes" ]; then 1.33 @@ -244,7 +246,7 @@ 1.34 fi 1.35 done 1.36 1.37 -[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo 1.38 +[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo 1.39 1.40 # Re-source main config file. In Live mode, daemons list can be modified 1.41 # by boot options (screen=text will remove slim). 1.42 @@ -259,7 +261,7 @@ 1.43 fi 1.44 done 1.45 1.46 -[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo 1.47 +[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo 1.48 1.49 # Back to a verbose mode. 1.50 echo "7 4 1 7" > /proc/sys/kernel/printk 1.51 @@ -270,8 +272,6 @@ 1.52 echo -e "\033[1m$MESSAGE\033[0m" 1.53 fi 1.54 1.55 -[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo 1.56 - 1.57 # Display and log boot time. 1.58 time=$((`date +%s` - $bootdate)) 1.59 echo $time > /var/log/boot-time