slitaz-boot-scripts rev 256
rcS: export SCREEN and source functions in user-home.sh
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Fri Apr 29 17:43:22 2011 +0200 (2011-04-29) |
parents | 49f03c9f0fd8 |
children | 63eaa6ed9233 |
files | etc/init.d/rcS etc/init.d/user-home.sh |
line diff
1.1 --- a/etc/init.d/rcS Fri Apr 29 16:31:32 2011 +0200 1.2 +++ b/etc/init.d/rcS Fri Apr 29 17:43:22 2011 +0200 1.3 @@ -49,13 +49,9 @@ 1.4 config=*) 1.5 export CONFIG=${opt#config=} ;; 1.6 xarg=*) 1.7 - XARG="$XARG ${opt#xarg=}" ;; 1.8 - screen=text) 1.9 - echo -n "Text mode option detected..." 1.10 - SCREEN=text 1.11 - status ;; 1.12 - screen=[0-9]*) 1.13 - SCREEN=${opt#screen=} ;; 1.14 + export XARG="$XARG ${opt#xarg=}" ;; 1.15 + screen=*) 1.16 + export SCREEN=${opt#screen=} ;; 1.17 autologin) 1.18 # Autologin option to skip first graphic login prompt. 1.19 echo "auto_login yes" >> /etc/slim.conf ;; 1.20 @@ -175,7 +171,7 @@ 1.21 1.22 # No text mode requested, we have i18n and Xorg settings as well as a 1.23 # user, so start a desktop and let boot process finih in backgroud. 1.24 -if [ "$screen" != "text" -a -x /etc/init.d/slim ]; then 1.25 +if [ "$SCREEN" != "text" -a -x /etc/init.d/slim ]; then 1.26 /etc/init.d/slim start 1.27 fi 1.28
2.1 --- a/etc/init.d/user-home.sh Fri Apr 29 16:31:32 2011 +0200 2.2 +++ b/etc/init.d/user-home.sh Fri Apr 29 17:43:22 2011 +0200 2.3 @@ -10,6 +10,7 @@ 2.4 # This option is not handled by a loop and case like others and has no 2.5 # effect on an installed system. 2.6 # 2.7 +. /etc/init.d/rc.functions 2.8 2.9 if ! grep -q "100[0-9]:100[0-9]" /etc/passwd; then 2.10 if grep -q "user=" /proc/cmdline; then