# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1301186792 -3600
# Node ID 30862cc9dce02c4233f144ec60e1b77a067be991
# Parent  3a7340a210126a95d1e5c885cc77345b02b2a601
Rollback rev 238 to release 4.1.2: it screw usb plug (mouse doesn't works into X)

diff -r 3a7340a21012 -r 30862cc9dce0 etc/init.d/rcS
--- a/etc/init.d/rcS	Sat Mar 26 19:31:19 2011 +0100
+++ b/etc/init.d/rcS	Sun Mar 27 01:46:32 2011 +0100
@@ -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 && sleep 1
+	echo "0" > /etc/fbsplash/fifo
 fi
 
+if [ "$1" != "logged" ]; then # logged
+
 echo "Processing /etc/init.d/rcS..."
 
 # Mount /proc.
@@ -53,6 +53,16 @@
 
 [ "$FBSPLASH" == "yes" ] && echo "20" > /etc/fbsplash/fifo
 
+# Trigger Udev and handle hotplug events
+if [ "$UDEV" = "yes" ]; then
+	echo -n "Udevadm requesting events from the Kernel..."
+	udevadm trigger
+	status
+	echo -n "Using Udev for hotplugging..."
+	echo "/sbin/udevd" > /proc/sys/kernel/hotplug
+	status
+fi
+
 # Before mounting filesystems we check fs specified in the file
 # /etc/rcS.conf and variable $CHECK_FS.
 if [ -n "$CHECK_FS" ]; then
@@ -68,22 +78,6 @@
 echo "Remounting rootfs read/write..."
 /bin/mount -o remount,rw /
 
-# Trigger Udev and handle hotplug events
-if [ "$UDEV" = "yes" ]; then
-	echo -n "Starting udev daemon..."
-	/sbin/udevd --daemon
-	status
-	echo -n "Udevadm requesting events from the Kernel..."
-	udevadm trigger
-	status
-	echo -n "Udevadm waiting for the event queue to finish..."
-	udevadm settle
-	status
-	echo -n "Using Udev for hotplugging..."
-	echo "/sbin/udevd" > /proc/sys/kernel/hotplug
-	status
-fi
-
 [ "$FBSPLASH" == "yes" ] && echo "30" > /etc/fbsplash/fifo
 
 # Mount filesystems in /etc/fstab.
@@ -233,7 +227,13 @@
 	/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
+	echo -n "Requesting events from the Kernel..."
+	udevadm trigger
+	status
+fi
 
 # Start all scripts specified with $RUN_SCRIPTS.
 echo "Executing all initialization scripts..."
@@ -244,7 +244,7 @@
 	fi
 done
 
-[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo
+[ "$FBSPLASH" == "yes" ] && echo "80" > /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 +259,7 @@
 	fi
 done
 
-[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo
+[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo
 
 # Back to a verbose mode.
 echo "7 4 1 7" > /proc/sys/kernel/printk
@@ -270,11 +270,12 @@
 	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
 echo "SliTaz boot time: ${time}s"
-
 [ "$FBSPLASH" == "yes" ] && echo "exit" > /etc/fbsplash/fifo
 
 fi # logged