# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1261503088 -3600
# Node ID cf3f10a1e2dca8481a40198d0b21baa3655cc848
# Parent  5a34e02fb165d4e53a59864e0cbf13916c4d66f1
tazx: fix patch_xorg_kbd and add config-xorg option (to config Xorg at boot time)

diff -r 5a34e02fb165 -r cf3f10a1e2dc tinyutils/tazx
--- a/tinyutils/tazx	Mon Dec 21 20:51:44 2009 +0100
+++ b/tinyutils/tazx	Tue Dec 22 18:31:28 2009 +0100
@@ -17,7 +17,7 @@
 WM=openbox
 
 # Default user for config files in Live mode.
-[ "$USER" = "root"] && USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1`
+USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1`
 
 ####################
 #  Tazx functions  #
@@ -33,11 +33,15 @@
 			patch -p0 <<EOF
 --- /etc/X11/xorg.conf
 +++ /etc/X11/xorg.conf
-@@ -30,2 +30,3 @@
+@@ -26,6 +26,8 @@
+ Section "InputDevice"
+ 	Identifier  "Keyboard0"
  	Driver      "kbd"
 +	Option      "XkbLayout"	 "ch"
 +	Option      "XkbVariant" "fr"
  EndSection
+ 
+ Section "InputDevice"
 EOF
 			;;
 		en)
@@ -45,11 +49,15 @@
 			patch -p0 <<EOF
 --- /etc/X11/xorg.conf
 +++ /etc/X11/xorg.conf
-@@ -30,2 +30,3 @@
+@@ -26,6 +26,8 @@
+ Section "InputDevice"
+ 	Identifier  "Keyboard0"
  	Driver      "kbd"
 +	Option      "XkbLayout"	 "en"
 +	Option      "XkbVariant" "en"
  EndSection
+ 
+ Section "InputDevice"
 EOF
 			;;
 		ru)
@@ -57,11 +65,13 @@
 			patch -p0 <<EOF
 --- /etc/X11/xorg.conf
 +++ /etc/X11/xorg.conf
-@@ -30,2 +30,3 @@
+@@ -26,6 +26,8 @@
  	Driver      "kbd"
 +	Option      "XkbLayout"	 "us,ru(winkeys)"
 +	Option      "XkbVariant" "grp:alt_shift_toggle"
  EndSection
+  
+ Section "InputDevice"
 EOF
 			;;
 		slovene)
@@ -69,11 +79,13 @@
 			patch -p0 <<EOF
 --- /etc/X11/xorg.conf
 +++ /etc/X11/xorg.conf
-@@ -30,2 +30,3 @@
+@@ -26,6 +26,8 @@
  	Driver      "kbd"
 +	Option      "XkbLayout"  "si"
 +	Option      "XkbOptions" "grp:alt_shift_toggle"
  EndSection
+   
+ Section "InputDevice"
 EOF
 			;;
 		*)
@@ -85,10 +97,12 @@
 			patch -p0 <<EOF
 --- /etc/X11/xorg.conf
 +++ /etc/X11/xorg.conf
-@@ -30,2 +30,3 @@
+@@ -26,6 +26,8 @@
  	Driver      "kbd"
 +	Option      "XkbLayout"	"$KEYMAP"
  EndSection
+   
+ Section "InputDevice"
 EOF
 		;;
 	esac
@@ -398,6 +412,16 @@
 		wm_config
 		creat_xinitrc
 		creat_xsession ;;
+	config-xorg)
+		# WM can be specified on cmdline.
+		if [ -n "$2" ]; then
+			WM=$2
+		fi
+		XSERVER="Xorg"
+		wm_config
+		creat_xinitrc
+		creat_xsession
+		patch_xorg_kbd ;;
 	*)
 		# WM can be specified on cmdline.
 		if [ -n "$1" ]; then