# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1203976793 0
# Node ID 439cb0a8e2d0c0c83c96bdb98d6a1c52bd17546b
# Parent  2bba74627aab37489a38432db8c8efebf6a7804e
Enhanced screen= kernel parameter

diff -r 2bba74627aab -r 439cb0a8e2d0 etc/init.d/bootopts.sh
--- a/etc/init.d/bootopts.sh	Mon Feb 25 17:04:17 2008 +0100
+++ b/etc/init.d/bootopts.sh	Mon Feb 25 21:59:53 2008 +0000
@@ -95,23 +95,6 @@
 	status
 fi
 
-# Check for a specified screen (screen=*).
-#
-if grep -q "screen=*" /proc/cmdline; then
-	SCREEN=`cat /proc/cmdline | sed 's/.*screen=\([^ ]*\).*/\1/'`
-	if [ "$SCREEN" = "text" ]; then
-		echo -n "Disabling X login manager: slim..."
-		sed -i s/'slim'/''/ /etc/rcS.conf
-		status
-		# Creat /etc/X11/screen.conf to avoid tazx execution by hwconf.sh
-		mkdir -p /etc/X11
-		echo 'SCREEN=1024x768x24' > /etc/X11/screen.conf
-	else
-		echo "Option not yet implemented: screen=$SCREEN"
-		sleep 2
-	fi
-fi
-
 # Laptop option to load ac and battery Kernel modules.
 if grep -q "laptop" /proc/cmdline; then
 	echo "Loading laptop modules: ac battery..."
diff -r 2bba74627aab -r 439cb0a8e2d0 etc/init.d/hwconf.sh
--- a/etc/init.d/hwconf.sh	Mon Feb 25 17:04:17 2008 +0100
+++ b/etc/init.d/hwconf.sh	Mon Feb 25 21:59:53 2008 +0000
@@ -42,5 +42,16 @@
 
 # Screen size config for slim/Xvesa.
 if [ ! -f /etc/X11/screen.conf -a -x /usr/bin/slim ]; then
-	tazx
+	if grep -q "screen=*" /proc/cmdline; then
+		export NEW_SCREEN=`cat /proc/cmdline | sed 's/.*screen=\([^ ]*\).*/\1/'`
+		if [ "$NEW_SCREEN" = "text" ]; then
+			echo -n "Disabling X login manager: slim..."
+			sed -i s/'slim'/''/ /etc/rcS.conf
+			status
+		else
+			tazx
+		fi
+	else
+		tazx
+	fi
 fi