# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1293016745 -3600
# Node ID 36546e2a0d3a123fc7f0e63ec193b250c95c3f42
# Parent  2cf65487f61023ad96e064a365f8fda124f80021
hwconf.sh: do not configure X11 for screen=text

diff -r 2cf65487f610 -r 36546e2a0d3a etc/init.d/hwconf.sh
--- a/etc/init.d/hwconf.sh	Mon Dec 20 18:43:01 2010 +0800
+++ b/etc/init.d/hwconf.sh	Wed Dec 22 12:19:05 2010 +0100
@@ -16,6 +16,7 @@
 		xarg=*)
 			XARG="$XARG ${opt#xarg=}" ;;
 		screen=text)
+				SCREEN=text
 				# Disable X.
 				echo -n "Disabling X login manager: slim..."
 				. /etc/rcS.conf
@@ -72,7 +73,7 @@
 fi
 
 # Xorg auto configuration.
-if [ ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then
+if [ "$SCREEN" != "text" -a ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then
 	echo "Configuring Xorg..."
 	# $HOME is not yet set.
 	HOME=/root
@@ -86,7 +87,7 @@
 # NOTE: Xvesa is unmaintained, package will be removed and all related
 # code cleaned
 #
-if [ ! -s /etc/X11/screen.conf -a -x /usr/bin/Xvesa ]; then
+if [ "$SCREEN" != "text" -a ! -s /etc/X11/screen.conf -a -x /usr/bin/Xvesa ]; then
 	# $HOME is not yet set.
 	HOME=/root
 	if [ -n "$XARG" ]; then