SliTaz Repositories

     1.1 --- a/etc/init.d/hwconf.sh	Mon Dec 20 18:43:01 2010 +0800
     1.2 +++ b/etc/init.d/hwconf.sh	Wed Dec 22 12:19:05 2010 +0100
     1.3 @@ -16,6 +16,7 @@
     1.4  		xarg=*)
     1.5  			XARG="$XARG ${opt#xarg=}" ;;
     1.6  		screen=text)
     1.7 +				SCREEN=text
     1.8  				# Disable X.
     1.9  				echo -n "Disabling X login manager: slim..."
    1.10  				. /etc/rcS.conf
    1.11 @@ -72,7 +73,7 @@
    1.12  fi
    1.13  
    1.14  # Xorg auto configuration.
    1.15 -if [ ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then
    1.16 +if [ "$SCREEN" != "text" -a ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then
    1.17  	echo "Configuring Xorg..."
    1.18  	# $HOME is not yet set.
    1.19  	HOME=/root
    1.20 @@ -86,7 +87,7 @@
    1.21  # NOTE: Xvesa is unmaintained, package will be removed and all related
    1.22  # code cleaned
    1.23  #
    1.24 -if [ ! -s /etc/X11/screen.conf -a -x /usr/bin/Xvesa ]; then
    1.25 +if [ "$SCREEN" != "text" -a ! -s /etc/X11/screen.conf -a -x /usr/bin/Xvesa ]; then
    1.26  	# $HOME is not yet set.
    1.27  	HOME=/root
    1.28  	if [ -n "$XARG" ]; then