SliTaz Repositories

     1.1 --- a/tinyutils/tazx	Sat Feb 23 00:54:38 2008 +0100
     1.2 +++ b/tinyutils/tazx	Sat Feb 23 10:37:06 2008 +0100
     1.3 @@ -95,11 +95,7 @@
     1.4  			Xvesa -ac -shadow -screen 800x600x16 -br &
     1.5  			exec xterm -cr orange -geometry 80x35+0-0 ;;
     1.6  		*)
     1.7 -			NEW_SCREEN=$value
     1.8 -			# /etc/X11/screen.conf exist for Live mode, if this file dos not
     1.9 -			# exist tazx is executed at boot time.
    1.10 -			mkdir -p /etc/X11
    1.11 -			echo "SCREEN=$NEW_SCREEN" > /etc/X11/screen.conf ;;
    1.12 +			NEW_SCREEN=$value ;;
    1.13  	esac
    1.14  }
    1.15  
    1.16 @@ -107,10 +103,14 @@
    1.17  slim_config()
    1.18  {
    1.19  	if test $(id -u) = 0; then
    1.20 +		# /etc/X11/screen.conf exist for Live mode, if this file dos not
    1.21 +		# exist tazx is executed at boot time.
    1.22 +		mkdir -p /etc/X11
    1.23 +		echo "SCREEN=$NEW_SCREEN" > /etc/X11/screen.conf
    1.24  		# Get current screen size and sed config file with the new value.
    1.25  		if [ -f /etc/slim.conf ]; then
    1.26  			RES=$(grep ^xserver_arguments /etc/slim.conf | sed 's/xserver_arguments.*-screen *//')
    1.27 -			sed "s/\(xserver_arguments.*-screen \).*/\1 $NEW_SCREEN/" /etc/slim.conf
    1.28 +			sed -i "s/\(xserver_arguments.*-screen \).*/\1 $NEW_SCREEN/" /etc/slim.conf
    1.29  		fi
    1.30  		JWM_CONFIG=/etc/jwm/system.jwmrc
    1.31  		change_jwm_background
    1.32 @@ -126,13 +126,34 @@
    1.33  	fi
    1.34  }
    1.35  
    1.36 +# Sample xinitrc for user (WM can be specified with F1 at slim login).
    1.37 +xinitrc_sample()
    1.38 +{
    1.39 +	cat >  $FILE << "EOF"
    1.40 +# ~/.xinitrc: Executed by slim login manager to startx X session.
    1.41 +#
    1.42 +case $1 in
    1.43 +	e17|enlightenment_start)
    1.44 +		exec enlightenment_start
    1.45 +		;;
    1.46 +	*)
    1.47 +		exec jwm
    1.48 +		;;
    1.49 +esac
    1.50 +EOF
    1.51 +}
    1.52 +
    1.53  # ~/.xinitrc for slim login.
    1.54  creat_xinitrc()
    1.55  {
    1.56 -	echo "$WM" > $HOME/.xinitrc
    1.57 +	FILE=$HOME/.xinitrc
    1.58 +	xinitrc_sample
    1.59 +	# In Live mode hacker needs a xinitrc, since tazx 
    1.60 +	# is executed only by root.
    1.61  	if [ ! -f /home/hacker/.xinitrc ]; then
    1.62 -		echo "$WM" > /home/hacker/.xinitrc
    1.63 -		chown hacker.hacker /home/hacker/.xinitrc
    1.64 +		FILE=/home/hacker/.xinitrc
    1.65 +		xinitrc_sample
    1.66 +		chown hacker.hacker $FILE
    1.67  	fi
    1.68  }
    1.69  
    1.70 @@ -158,27 +179,17 @@
    1.71  # only by startx, Slim login manager use .xinitrc).
    1.72  creat_xsession()
    1.73  {
    1.74 -	cat > $HOME/.xsession << _EOT_
    1.75 -# ~/.xsession: Start X window session on your system.
    1.76 +	cat > $HOME/.xsession << _EOF_
    1.77 +# ~/.xsession: Start X window session manually on your system (startx).
    1.78  #
    1.79  $XSERVER -ac -shadow $XSEVER_OPTS -screen $NEW_SCREEN -mouse $MOUSE &
    1.80  #xterm &
    1.81  #xpad &
    1.82  exec $WM
    1.83 -_EOT_
    1.84 +_EOF_
    1.85  	chmod 700 $HOME/.xsession
    1.86  }
    1.87  
    1.88 -# Console message.
    1.89 -console_message()
    1.90 -{
    1.91 -	echo ""
    1.92 -	echo "X server   : $XSERVER"
    1.93 -	echo "Screen     : $NEW_SCREEN"
    1.94 -	echo "Exec WM    : $WM"
    1.95 -	echo ""
    1.96 -}
    1.97 -
    1.98  ###################
    1.99  #  Tazx sequence  #
   1.100  ###################
   1.101 @@ -189,6 +200,5 @@
   1.102  creat_xinitrc
   1.103  jwm_config
   1.104  creat_xsession
   1.105 -console_message
   1.106  
   1.107  exit 0