From 11342ab0429a070a0c7307e924e9ea1995c53f02 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sun, 25 Apr 2010 18:49:50 +0200
Subject: aaabasifs, ajout de 10-keyboard.conf

---
 base/aaabasicfs/.footprint       | 4 +++-
 base/aaabasicfs/.md5sum          | 1 +
 base/aaabasicfs/10-keyboard.conf | 9 +++++++++
 base/aaabasicfs/Pkgfile          | 7 ++++---
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 base/aaabasicfs/10-keyboard.conf

diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index f7d8946c5..e0e6910cb 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -7,6 +7,8 @@ crw-------	root/root	dev/console (5, 1)
 crw-rw-rw-	root/root	dev/null (1, 3)
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/X11/
+drwxr-xr-x	root/root	etc/X11/xorg.conf.d/
+-rw-r--r--	root/root	etc/X11/xorg.conf.d/10-keyboard.conf
 -rw-r--r--	root/root	etc/bashrc
 -rw-r--r--	root/root	etc/blfs-bootscripts
 drwxr-xr-x	root/root	etc/default/
@@ -136,6 +138,7 @@ drwxr-x---	root/root	root/
 -rw-r--r--	root/root	root/.bash_profile
 -rw-r--r--	root/root	root/.bashrc
 lrwxrwxrwx	root/root	root/.xinitrc -> ../etc/skel/.xinitrc
+lrwxrwxrwx	root/root	root/10-keyboard.conf -> ../etc/X11/xorg.conf.d/10-keyboard.conf
 lrwxrwxrwx	root/root	root/X.sh -> ../etc/profile.d/X.sh
 lrwxrwxrwx	root/root	root/bashrc -> ../etc/bashrc
 drwxr-xr-x	root/root	root/bin/
@@ -166,7 +169,6 @@ lrwxrwxrwx	root/root	root/resolv.conf -> ../etc/resolv.conf
 lrwxrwxrwx	root/root	root/shells -> ../etc/shells
 lrwxrwxrwx	root/root	root/unmask.sh -> ../etc/profile.d/unmask.sh
 lrwxrwxrwx	root/root	root/useradd -> ../etc/default/useradd
-lrwxrwxrwx	root/root	root/xorg.conf -> ../etc/X11/xorg.conf
 drwxr-xr-x	root/root	sbin/
 drwxr-xr-x	root/root	srv/
 drwxrwxrwt	root/root	srv/sources/
diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 5b549de79..57a0acca6 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -1,3 +1,4 @@
+c230490b8f829976d1d56b3246e2ba77  10-keyboard.conf
 d5dda9fafee54d7caa37493ca42f384c  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 427f04bb0e7ba3394054a1215fdca87c  bashrc
diff --git a/base/aaabasicfs/10-keyboard.conf b/base/aaabasicfs/10-keyboard.conf
new file mode 100644
index 000000000..f6d9619fb
--- /dev/null
+++ b/base/aaabasicfs/10-keyboard.conf
@@ -0,0 +1,9 @@
+Section "InputClass"
+	Identifier	"Generic Keyboard"
+	Driver		"evdev"
+	Option		"CoreKeyboard"
+	Option		"XkbRules"	"xorg"
+	Option		"XkbModel"	"pc105"
+	Option		"XkbLayout"	"fr"
+	Option		"XkbOptions"	"grp:alt_shift_toggle"
+EndSection
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index ba327288d..1b6841164 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -9,7 +9,7 @@ version=2010
 release=1
 scriptsversion=lfs-bootscripts-20100124
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
- hosts clock console fstab inittab message inputrc network \
+ hosts clock console fstab inittab message inputrc network 10-keyboard.conf \
  profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \
  blfs-bootscripts nu readline.sh unmask.sh X.sh i18n.sh bashrc )
 
@@ -170,7 +170,8 @@ EOF
 [Desktop]
 Session=
 EOF
-	mkdir -v $PKG/etc/X11
+	mkdir -vp $PKG/etc/X11/xorg.conf.d
+	cp -v $SRC/10-keyboard.conf $PKG/etc/X11/xorg.conf.d/
 	cd $PKG/root/
 	ln -s ../etc/fstab
 	ln -s ../etc/hosts
@@ -196,7 +197,7 @@ EOF
 	ln -s ../etc/sysconfig/console
 	ln -s ../etc/sysconfig/network
 	ln -s ../etc/sysconfig/modules
-	ln -s ../etc/X11/xorg.conf
+	ln -s ../etc/X11/xorg.conf.d/10-keyboard.conf
 	ln -s ../etc/default/useradd
 	ln -s ../etc/prt-get.conf
 	ln -s ../etc/pkg-get.conf
-- 
cgit v1.2.3-70-g09d2