From e67b650a7123d629d1ed0528a6aaf33389bbeb4d Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sun, 20 Feb 2011 12:26:29 +0100
Subject: aaabasicfs, maj 20110220-1*

---
 base/aaabasicfs/.md5sum.i686   |  4 ++--
 base/aaabasicfs/.md5sum.x86_64 |  4 ++--
 base/aaabasicfs/Pkgfile        |  5 +++--
 base/aaabasicfs/X.sh           |  8 ++++----
 base/aaabasicfs/inittab        | 16 ++++++++--------
 5 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'base/aaabasicfs')

diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686
index 951d62f79..7b128c738 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -1,4 +1,4 @@
-f75bb47bdba4fa5c707f3ade75ddcc4d  X.sh
+5b74148cdacc6b0b3e814fd5d5a8c05c  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
@@ -6,7 +6,7 @@ deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 0286a09ca5d7515c29ad5ff8f88fb9f3  fstab
-3e80932d8f9af70371384a740b4c0809  inittab
+2206fc2c9086fdc1e0c7d763f37f92ba  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
 fce16832185920c8bea816cb2ebb2b28  lfs-bootscripts-20100627.tar.bz2
diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64
index 951d62f79..7b128c738 100644
--- a/base/aaabasicfs/.md5sum.x86_64
+++ b/base/aaabasicfs/.md5sum.x86_64
@@ -1,4 +1,4 @@
-f75bb47bdba4fa5c707f3ade75ddcc4d  X.sh
+5b74148cdacc6b0b3e814fd5d5a8c05c  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
@@ -6,7 +6,7 @@ deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 0286a09ca5d7515c29ad5ff8f88fb9f3  fstab
-3e80932d8f9af70371384a740b4c0809  inittab
+2206fc2c9086fdc1e0c7d763f37f92ba  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
 fce16832185920c8bea816cb2ebb2b28  lfs-bootscripts-20100627.tar.bz2
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index e5a7df4c5..c8b569887 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -4,10 +4,11 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=aaabasicfs
-version=20110214
+version=20110220
 release=1
 scriptsversion=lfs-bootscripts-20100627
 BLFSscriptsversion=20100825
+XORG_PREFIX=/usr
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
 	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
  fstab inittab message inputrc network rc splashy_stop\
@@ -49,7 +50,7 @@ build() {
 	# Creating essential Files and Symlinks
 	touch $PKG/etc/mtab
 	ln -s bash $PKG/bin/sh
-	ln -s /usr $PKG/usr/X11R6
+	ln -s $XORG_PREFIX $PKG/$XORG_PREFIX/X11R6
 	mkdir -p $PKG/var/lib/pkg/
 	echo "$version-$release" > $PKG/var/lib/pkg/nutyx-version
 	ln -s /var/lib/pkg/nutyx-version $PKG/etc/nutyx-version
diff --git a/base/aaabasicfs/X.sh b/base/aaabasicfs/X.sh
index 2f9923c87..222ebaba4 100644
--- a/base/aaabasicfs/X.sh
+++ b/base/aaabasicfs/X.sh
@@ -5,10 +5,10 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
 export INFOPATH=/usr/share/info
 export PYTHONPATH=/usr/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages/GMenuSimpleEditor
 if [ -x /usr/X11R6/bin/X ]; then
- pathappend /usr/X11R6/bin
- XDG_DATA_DIRS=/usr/share:/usr/share/akonadi/agents:/usr/local/share
- XDG_CONFIG_DIRS=/etc/gnome/xdg:/etc/kde/xdg:/etc/xdg
- export XDG_DATA_DIRS XDG_CONFIG_DIRS
+	pathappend /usr/X11R6/bin
+	XDG_DATA_DIRS=/usr/share:/usr/share/akonadi/agents:/usr/local/share
+	XDG_CONFIG_DIRS=/etc/gnome/xdg:/etc/kde/xdg:/etc/xdg
+	export XDG_DATA_DIRS XDG_CONFIG_DIRS
 	
 fi
 if [ -d /usr/X11R6/lib/pkgconfig ] ; then
diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab
index a9ccded71..31cc01c58 100644
--- a/base/aaabasicfs/inittab
+++ b/base/aaabasicfs/inittab
@@ -20,14 +20,14 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now
 
 su:S016:once:/sbin/sulogin
 
-1:23:respawn:/sbin/agetty tty1 9600
-2:23:respawn:/sbin/agetty tty2 9600
-3:23:respawn:/sbin/agetty tty3 9600
-4:23:respawn:/sbin/agetty tty4 9600
-5:23:respawn:/sbin/agetty tty5 9600
-6:23:respawn:/sbin/agetty tty6 9600
-
-20:4:respawn:/usr/sbin/gdm
+1:2345:respawn:/sbin/agetty tty1 9600
+2:2345:respawn:/sbin/agetty tty2 9600
+3:2345:respawn:/sbin/agetty tty3 9600
+4:2345:respawn:/sbin/agetty tty4 9600
+5:2345:respawn:/sbin/agetty tty5 9600
+6:2345:respawn:/sbin/agetty tty6 9600
+
+20:4:respawn:/usr/sbin/lxdm >& /dev/null
 
 30:5:respawn:/usr/bin/kdm
 
-- 
cgit v1.2.3-70-g09d2