SliTaz Repositories

     1.1 --- a/tinyutils/tazx	Fri Mar 21 00:27:36 2008 +0100
     1.2 +++ b/tinyutils/tazx	Fri Mar 21 02:18:39 2008 +0100
     1.3 @@ -26,6 +26,14 @@
     1.4  # Install xorg server
     1.5  install_xorg()
     1.6  {
     1.7 +	if [ -e /tmp/.X11-unix/.X0 ]; then
     1.8 +		cat <<EOF
     1.9 +Vous devez sortir du serveur X pour installer Xorg
    1.10 +Puis relancer tazx et enfin relancer le serveur X
    1.11 +"'startx' ou '/etc/init.d/slim start'
    1.12 +EOF
    1.13 +		exit 1
    1.14 +	fi
    1.15  	tazpkg recharge
    1.16  	exec 3>&1
    1.17  	value=`$DIALOG --clear --colors --title " Install Xorg " \
    1.18 @@ -55,8 +63,17 @@
    1.19  		*)
    1.20  			tazpkg get-install xorg-server
    1.21  			tazpkg get-install xorg-xf86-video-$value
    1.22 -			xorg -configure
    1.23 +			Xorg -configure
    1.24  			mv /root/xorg.conf.new /etc/X11/xorg.conf
    1.25 +			. /etc/kmap.conf
    1.26 +			patch -p0 <<EOF
    1.27 +--- /etc/X11/xorg.conf
    1.28 ++++ /etc/X11/xorg.conf
    1.29 +@@ -30,2 +30,3 @@
    1.30 + 	Driver      "kbd"
    1.31 ++	Option      "XkbLayout"	"${KMAP%.kmap}"
    1.32 + EndSection
    1.33 +EOF
    1.34  			sed -i 's|/usr/bin/Xvesa|/usr/bin/Xorg|' /etc/slim.conf
    1.35  			sed -i s/"^xserver_arguments"/'\#xserver_arguments'/ /etc/slim.conf
    1.36  			XSERVER=Xorg;;