From 921cb2ef417328f1caa58bf154fcb8dd8caaffdb Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Tue, 24 Aug 2010 20:59:03 +0200
Subject: maj aaabasicfs#2010-24082010

---
 base/aaabasicfs/.footprint | 2 +-
 base/aaabasicfs/Pkgfile    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'base/aaabasicfs')

diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index 5448ca235..80c3f249e 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -147,7 +147,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/20-keyboard.conf -> ../etc/X11/xorg.conf.d/20-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/
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 9e99b3993..424f21258 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,7 +5,7 @@
 
 name=aaabasicfs
 version=2010
-release=09082010
+release=24082010
 scriptsversion=lfs-bootscripts-20100627
 BLFSscriptsversion=20090302
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
@@ -189,6 +189,11 @@ EOF
 	cat > $PKG/etc/skel/.dmrc << "EOF"
 [Desktop]
 Session=
+EOF
+	cat >> $PKG/etc/profile.d/extrapaths.sh << "EOF"
+if [ -d /install ]; then
+        pathappend /install
+fi
 EOF
 	cd $PKG/root/
 	ln -s ../etc/fstab
@@ -215,7 +220,7 @@ EOF
 	ln -s ../etc/sysconfig/console
 	ln -s ../etc/sysconfig/network
 	ln -s ../etc/sysconfig/modules
-	ln -s ../etc/X11/xorg.conf.d/10-keyboard.conf
+	ln -s ../etc/X11/xorg.conf.d/20-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