# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1392486646 -3600
# Node ID 612a6f9874c058514a58765724f8d36c42d3192d
# Parent  89d0f484166fb0fca08597221d6b72aad8579d74
Start X later in boot process

diff -r 89d0f484166f -r 612a6f9874c0 etc/init.d/network.sh
--- a/etc/init.d/network.sh	Fri Jan 31 19:09:01 2014 +0000
+++ b/etc/init.d/network.sh	Sat Feb 15 18:50:46 2014 +0100
@@ -136,7 +136,7 @@
 				wpa_supplicant -B -W -c/tmp/wpa.conf \
 					-D$WPA_DRIVER -i$WIFI_INTERFACE ;;
 		esac
-		rm -f /tmp/wpa.conf
+		#rm -f /tmp/wpa.conf
 		INTERFACE=$WIFI_INTERFACE
 	fi
 }
diff -r 89d0f484166f -r 612a6f9874c0 etc/init.d/rcS
--- a/etc/init.d/rcS	Fri Jan 31 19:09:01 2014 +0000
+++ b/etc/init.d/rcS	Sat Feb 15 18:50:46 2014 +0100
@@ -12,7 +12,6 @@
 # Set PATH, TZ and boot time.
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 [ -s /etc/TZ ] && export TZ="$(cat /etc/TZ)"
-[ -n "$bootdate" ] || bootdate=$(date +%s)
 
 case "$1" in
 
@@ -90,11 +89,12 @@
 done
 status
 
-# Clean up the system and set up tmp dirs.
+# Clean up the system and set up tmp dirs */run/* are tmpfs so ther are 
+# clean up at shutdown.
 if [ "$CLEAN_UP_SYSTEM" = "yes" ]; then
 	echo -n "Cleaning up the system..."
-	rm -rf /tmp /var/run /run
-	mkdir -p /tmp/.X11-unix /tmp/.ICE-unix /run/dbus /var/run
+	rm -rf /tmp
+	mkdir -p /tmp/.X11-unix /tmp/.ICE-unix
 	chmod -R 1777 /tmp
 	status
 else
@@ -187,6 +187,14 @@
 	done
 fi
 
+# Start X sesssion
+if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] && [ -x /etc/init.d/$LOGIN_MANAGER ]; then
+	mkdir -p  /var/run/dbus
+	/etc/init.d/dbus start
+	colorize 36 "Starting X environment..."
+	(sleep 2 && /etc/init.d/$LOGIN_MANAGER start >/dev/null) &
+fi
+
 # Back to a verbose mode
 (sleep 6 && echo "7 4 1 7" > /proc/sys/kernel/printk) &
 
@@ -194,11 +202,6 @@
 	newline
 	colorize 32 "$MESSAGE"
 fi
-
-# Display and log boot time
-time=$((`date +%s` - $bootdate))
-echo $time > /var/log/boot-time
-echo "SliTaz boot time: ${time}s"
 ;;
 
 *)
diff -r 89d0f484166f -r 612a6f9874c0 etc/init.d/system.sh
--- a/etc/init.d/system.sh	Fri Jan 31 19:09:01 2014 +0000
+++ b/etc/init.d/system.sh	Sat Feb 15 18:50:46 2014 +0100
@@ -127,16 +127,5 @@
 	tazx config-xorg 2>/var/log/xorg.configure.log
 fi
 
-# Start X sesssion as soon as possible
-if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] && [ -x /etc/init.d/$LOGIN_MANAGER ]; then
-	echo -n "Starting X environment..."
-	/etc/init.d/dbus start >/dev/null
-	if [ $(/bin/hostname) == '(none)' ];then
-		/bin/hostname -F /etc/hostname
-	fi
-	/etc/init.d/$LOGIN_MANAGER start >/dev/null &
-	status
-fi
-
 # Start TazPanel
 [ -x /usr/bin/tazpanel ] && tazpanel start