slitaz-boot-scripts rev 385

Do not depend on /etc/slitaz/applications.conf
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jan 10 13:35:51 2015 +0100 (2015-01-10)
parents d51fd6bbb28e
children e8089893c4d7
files etc/init.d/bootopts.sh etc/init.d/rcS
line diff
     1.1 --- a/etc/init.d/bootopts.sh	Tue Nov 18 15:48:48 2014 +0100
     1.2 +++ b/etc/init.d/bootopts.sh	Sat Jan 10 13:35:51 2015 +0100
     1.3 @@ -35,7 +35,8 @@
     1.4  	fi
     1.5  	
     1.6  	# Make sure we have users applications.conf
     1.7 -	if [ ! -f "/etc/skel/.config/slitaz/applications.conf" ]; then
     1.8 +	if [ ! -f "/etc/skel/.config/slitaz/applications.conf" -a
     1.9 +	     -f cp /etc/slitaz/applications.conf ]; then
    1.10  		mkdir -p /etc/skel/.config/slitaz
    1.11  		cp /etc/slitaz/applications.conf /etc/skel/.config/slitaz
    1.12  	fi
     2.1 --- a/etc/init.d/rcS	Tue Nov 18 15:48:48 2014 +0100
     2.2 +++ b/etc/init.d/rcS	Sat Jan 10 13:35:51 2015 +0100
     2.3 @@ -182,7 +182,8 @@
     2.4  # Start X session. Dbus must be started before Xorg and other daemons. 
     2.5  # We started it here because X is run before RUN_DAEMONS. Sleep, in 
     2.6  # some in live mode we boot too fast and X can't initialize.
     2.7 -if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] && \
     2.8 +if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] &&
     2.9 +	[ -x /usr/bin/tazx ] && [ -s /etc/slitaz/applications.conf ] &&
    2.10  	[ -x "/etc/init.d/$LOGIN_MANAGER" ]; then
    2.11  	colorize 36 "Starting X environment..."
    2.12  	# We need Xorg 40-Keyboard.conf and SliTaz applications.conf
    2.13 @@ -198,6 +199,7 @@
    2.14  if [ "$RUN_DAEMONS" ]; then
    2.15  	colorize 33 "Starting all daemons..."
    2.16  	for daemon in $RUN_DAEMONS; do
    2.17 +		[ -x /etc/init.d/$daemon ] &&
    2.18  		/etc/init.d/$daemon start
    2.19  	done
    2.20  fi