slitaz-boot-scripts diff etc/init.d/rcS @ rev 359
Fix: starting Xorg (we dont need any config file)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu May 01 22:14:02 2014 +0200 (2014-05-01) |
parents | 93758e8de78a |
children | b14f03e7493f |
line diff
1.1 --- a/etc/init.d/rcS Fri Mar 14 00:14:16 2014 +0100 1.2 +++ b/etc/init.d/rcS Thu May 01 22:14:02 2014 +0200 1.3 @@ -178,6 +178,18 @@ 1.4 /etc/init.d/$script 1.5 done 1.6 1.7 +# Start X session 1.8 +if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] && [ -x "/etc/init.d/$LOGIN_MANAGER" ]; then 1.9 + colorize 36 "Starting X environment..." 1.10 + # We need Xorg 40-Keyboard.conf and SliTaz applications.conf 1.11 + if [ ! -s "/etc/X11/xorg.conf.d/40-Keyboard.conf" ]; then 1.12 + echo "Configuring Xorg server..." && HOME="/root" 1.13 + tazx init 1.14 + fi 1.15 + #/etc/init.d/dbus start 1.16 + (sleep 2; /etc/init.d/${LOGIN_MANAGER} start >/dev/null) & 1.17 +fi 1.18 + 1.19 # Start all daemons specified with $RUN_DAEMONS 1.20 if [ "$RUN_DAEMONS" ]; then 1.21 colorize 33 "Starting all daemons..." 1.22 @@ -186,14 +198,6 @@ 1.23 done 1.24 fi 1.25 1.26 -# Start X session 1.27 -if [ "$SCREEN" != "text" ] && [ "$LOGIN_MANAGER" ] && [ -x /etc/init.d/$LOGIN_MANAGER ]; then 1.28 - mkdir -p /var/run/dbus 1.29 - /etc/init.d/dbus start 1.30 - colorize 36 "Starting X environment..." 1.31 - (sleep 2 && /etc/init.d/$LOGIN_MANAGER start >/dev/null) & 1.32 -fi 1.33 - 1.34 # Back to a verbose mode 1.35 (sleep 6 && echo "7 4 1 7" > /proc/sys/kernel/printk) & 1.36