slitaz-tools rev 203

tazx: source /etc/keymap.conf (kmap.conf is removed)
author Christophe Lincoln <pankso@slitaz.org>
date Tue May 20 17:35:21 2008 +0200 (2008-05-20)
parents d4475be45426
children df6285a99463
files tinyutils/tazx
line diff
     1.1 --- a/tinyutils/tazx	Tue May 20 15:10:12 2008 +0000
     1.2 +++ b/tinyutils/tazx	Tue May 20 17:35:21 2008 +0200
     1.3 @@ -57,7 +57,7 @@
     1.4  			tazpkg get-install xorg-xf86-video-$value
     1.5  			Xorg -configure :1
     1.6  			mv /root/xorg.conf.new /etc/X11/xorg.conf
     1.7 -			. /etc/kmap.conf
     1.8 +			. /etc/keymap.conf
     1.9  			patch -p0 <<EOF
    1.10  --- /etc/X11/xorg.conf
    1.11  +++ /etc/X11/xorg.conf
    1.12 @@ -177,7 +177,7 @@
    1.13  {
    1.14  	cat >  $FILE << "EOF"
    1.15  # ~/.xinitrc: Executed by slim login manager to startx X session.
    1.16 -# You can use F1 with Slim or 'tazx' to configure permanantly 
    1.17 +# You can use F1 with Slim or 'tazx' to configure permanantly
    1.18  # your default WM: tazx e17
    1.19  #
    1.20  WM=openbox-session
    1.21 @@ -208,8 +208,8 @@
    1.22  {
    1.23  	FILE=$HOME/.xinitrc
    1.24  	xinitrc_sample
    1.25 -	
    1.26 -	# In Live mode hacker needs a xinitrc, since tazx 
    1.27 +
    1.28 +	# In Live mode hacker needs a xinitrc, since tazx
    1.29  	# is executed only by root.
    1.30  	if [ ! -f /home/hacker/.xinitrc ]; then
    1.31  		FILE=/home/hacker/.xinitrc
    1.32 @@ -226,7 +226,7 @@
    1.33  		if [ ! -f "$JWM_CONFIG" ]; then
    1.34  			cp /etc/jwm/system.jwmrc $JWM_CONFIG
    1.35  		fi
    1.36 -		# In Live mode hacker/root JWM config dose not exist ans $HOME is 
    1.37 +		# In Live mode hacker/root JWM config dose not exist ans $HOME is
    1.38  		# ot set, this is because tazx is executed by boot scripts.
    1.39  		if [ ! -f "/home/hacker/.jwmrc" ]; then
    1.40  			JWM_CONFIG=/home/hacker/.jwmrc
    1.41 @@ -240,7 +240,7 @@
    1.42  	fi
    1.43  }
    1.44  
    1.45 -# Creat ~/.xsession to keep the configuration selected (used 
    1.46 +# Creat ~/.xsession to keep the configuration selected (used
    1.47  # only by startx, Slim login manager use .xinitrc).
    1.48  creat_xsession()
    1.49  {