# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1304091802 -7200
# Node ID c76406c5b7c5eff869e1630e7178d97154561cd0
# Parent  49f03c9f0fd8fd1dd3727661a924fc9c9a7fcd6c
rcS: export SCREEN and source functions in user-home.sh

diff -r 49f03c9f0fd8 -r c76406c5b7c5 etc/init.d/rcS
--- a/etc/init.d/rcS	Fri Apr 29 16:31:32 2011 +0200
+++ b/etc/init.d/rcS	Fri Apr 29 17:43:22 2011 +0200
@@ -49,13 +49,9 @@
 		config=*)
 			export CONFIG=${opt#config=} ;;
 		xarg=*)
-			XARG="$XARG ${opt#xarg=}" ;;
-		screen=text)
-			echo -n "Text mode option detected..."
-			SCREEN=text
-			status ;;
-		screen=[0-9]*)
-			SCREEN=${opt#screen=} ;;
+			export XARG="$XARG ${opt#xarg=}" ;;
+		screen=*)
+			export SCREEN=${opt#screen=} ;;
 		autologin)
 			# Autologin option to skip first graphic login prompt.
 			echo "auto_login        yes" >> /etc/slim.conf ;;
@@ -175,7 +171,7 @@
 
 # No text mode requested, we have i18n and Xorg settings as well as a 
 # user, so start a desktop and let boot process finih in backgroud.
-if [ "$screen" != "text" -a -x /etc/init.d/slim ]; then
+if [ "$SCREEN" != "text" -a -x /etc/init.d/slim ]; then
 	/etc/init.d/slim start
 fi
 
diff -r 49f03c9f0fd8 -r c76406c5b7c5 etc/init.d/user-home.sh
--- a/etc/init.d/user-home.sh	Fri Apr 29 16:31:32 2011 +0200
+++ b/etc/init.d/user-home.sh	Fri Apr 29 17:43:22 2011 +0200
@@ -10,6 +10,7 @@
 # This option is not handled by a loop and case like others and has no
 # effect on an installed system.
 #
+. /etc/init.d/rc.functions
 
 if ! grep -q "100[0-9]:100[0-9]" /etc/passwd; then
 	if grep -q "user=" /proc/cmdline; then