# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1420893351 -3600
# Node ID f0e04a0ba4d5b15ff9a9e87dcf67099080ffa7cc
# Parent  d51fd6bbb28e55f97b3824b15cc860100fe9e2c5
Do not depend on /etc/slitaz/applications.conf

diff -r d51fd6bbb28e -r f0e04a0ba4d5 etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Tue Nov 18 15:48:48 2014 +0100
+++ b/etc/init.d/bootopts.sh	Sat Jan 10 13:35:51 2015 +0100
@@ -35,7 +35,8 @@
 	fi
 	
 	# Make sure we have users applications.conf
-	if [ ! -f "/etc/skel/.config/slitaz/applications.conf" ]; then
+	if [ ! -f "/etc/skel/.config/slitaz/applications.conf" -a
+	     -f cp /etc/slitaz/applications.conf ]; then
 		mkdir -p /etc/skel/.config/slitaz
 		cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz
 	fi
diff -r d51fd6bbb28e -r f0e04a0ba4d5 etc/init.d/rcS
--- a/etc/init.d/rcS	Tue Nov 18 15:48:48 2014 +0100
+++ b/etc/init.d/rcS	Sat Jan 10 13:35:51 2015 +0100
@@ -182,7 +182,8 @@
 # Start X session. Dbus must be started before Xorg and other daemons. 
 # We started it here because X is run before RUN_DAEMONS. Sleep, in 
 # some in live mode we boot too fast and X can't initialize.
-if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] && \
+if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] &&
+	[ -x /usr/bin/tazx ] && [ -s /etc/slitaz/applications.conf ] &&
 	[ -x "/etc/init.d/$LOGIN_MANAGER" ]; then
 	colorize 36 "Starting X environment..."
 	# We need Xorg 40-Keyboard.conf and SliTaz applications.conf
@@ -198,6 +199,7 @@
 if [ "$RUN_DAEMONS" ]; then
 	colorize 33 "Starting all daemons..."
 	for daemon in $RUN_DAEMONS; do
+		[ -x /etc/init.d/$daemon ] &&
 		/etc/init.d/$daemon start
 	done
 fi