aaabasicfs 2012-7 màj lfs-bootscripts-20120524 + ajout /etc/lfs-release + correction chemin utilisateur gdm

4 files changed, 13 insertions, 9 deletions

diff --git a/aaabasicfs/.footprint.x86_64 b/aaabasicfs/.footprint.x86_64
index 9a697a0a4..832697afd 100644
--- a/aaabasicfs/.footprint.x86_64
+++ b/aaabasicfs/.footprint.x86_64
@@ -14,6 +14,7 @@ drwxr-xr-x	root/root	etc/default/
 lrwxrwxrwx	root/root	etc/init.d -> rc.d/init.d
 -rw-r--r--	root/root	etc/inittab
 -rw-r--r--	root/root	etc/inputrc
+-rw-r--r--	root/root	etc/lfs-release
 drwxr-xr-x	root/root	etc/modprobe.d/
 -rw-r--r--	root/root	etc/mtab (EMPTY)
 lrwxrwxrwx	root/root	etc/nutyx-version -> /var/lib/pkg/nutyx-version
@@ -55,7 +56,7 @@ lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K45random -> ../init.d/random
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K80network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K90sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S60sendsignals -> ../init.d/sendsignals
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S70swap -> ../init.d/swap
+lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S65swap -> ../init.d/swap
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S80mountfs -> ../init.d/mountfs
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S90localnet -> ../init.d/localnet
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/S99halt -> ../init.d/halt
@@ -84,7 +85,7 @@ lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K45random -> ../init.d/random
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K80network -> ../init.d/network
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K90sysklogd -> ../init.d/sysklogd
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S60sendsignals -> ../init.d/sendsignals
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S70swap -> ../init.d/swap
+lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S65swap -> ../init.d/swap
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S80mountfs -> ../init.d/mountfs
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S90localnet -> ../init.d/localnet
 lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S99reboot -> ../init.d/reboot
diff --git a/aaabasicfs/.md5sum.i686 b/aaabasicfs/.md5sum.i686
index b84dbe363..e7de0c159 100644
--- a/aaabasicfs/.md5sum.i686
+++ b/aaabasicfs/.md5sum.i686
@@ -8,7 +8,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 532028c42db83a1a70cf75dfcdcaf71b  fstab
 ccedc7098a844e92db6bd179f13f550b  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
-d640fef997817bf6cea4d1eb621c36f2  lfs-bootscripts-20120505.tar.bz2
+50497e7d3890db28860aa3e0ae577e37  lfs-bootscripts-20120524.tar.bz2
 f0d82fd62e5dfc628addb1c6f4617b6e  network
 c661d321ada89d6a2f1a1dde39f00a25  nu
 210fdabd07248f79617508807715167b  profile
diff --git a/aaabasicfs/.md5sum.x86_64 b/aaabasicfs/.md5sum.x86_64
index b84dbe363..e7de0c159 100644
--- a/aaabasicfs/.md5sum.x86_64
+++ b/aaabasicfs/.md5sum.x86_64
@@ -8,7 +8,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 532028c42db83a1a70cf75dfcdcaf71b  fstab
 ccedc7098a844e92db6bd179f13f550b  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
-d640fef997817bf6cea4d1eb621c36f2  lfs-bootscripts-20120505.tar.bz2
+50497e7d3890db28860aa3e0ae577e37  lfs-bootscripts-20120524.tar.bz2
 f0d82fd62e5dfc628addb1c6f4617b6e  network
 c661d321ada89d6a2f1a1dde39f00a25  nu
 210fdabd07248f79617508807715167b  profile
diff --git a/aaabasicfs/Pkgfile b/aaabasicfs/Pkgfile
index a3a959959..5b2cc2d58 100644
--- a/aaabasicfs/Pkgfile
+++ b/aaabasicfs/Pkgfile
@@ -5,11 +5,12 @@
 
 name=aaabasicfs
 version=2012
-release=6
-scriptsversion=lfs-bootscripts-20120505
+release=7
+scriptsversion=20120524
 BLFSscriptsversion=201205011
+lfs_release=SVN-$scriptsversion
 XORG_PREFIX=/usr
-source=(http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2
+source=(http://www.linuxfromscratch.org/lfs/downloads/development/lfs-bootscripts-$scriptsversion.tar.bz2
 	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
 	fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh
 	bash_profile bashrc bashrc.etc nu readline.sh unmask.sh X.sh )
@@ -69,7 +70,7 @@ lp:x:9:9:Print Service User:/dev/null:/bin/false
 messagebus:x:18:18:D-BUS Message Daemon User:/dev/null:/bin/false
 haldaemon:x:19:19:HAL Daemon User:/dev/null:/bin/false
 named:x:20:20:BIND Owner:/home/named:/bin/false
-gdm:x:21:21:GDM Daemon User:/dev/null:/sbin/nologin
+gdm:x:21:21:GDM Daemon User:/var/lib/gdm:/sbin/nologin
 fcron:x:22:22:Fcron User:/dev/null:/bin/false
 kdm:x:23:23:KDM Daemon User:/dev/null:/bin/false
 lxdm:x:24:24:LXDM Daemon User:/dev/null:/sbin/nologin
@@ -160,7 +161,7 @@ EOF
 	chgrp -v 13 $PKG/var/run/utmp $PKG/var/log/lastlog
 	chmod -v 664 $PKG/var/run/utmp $PKG/var/log/lastlog
 	# Bootscripts
-	cd $scriptsversion
+	cd lfs-bootscripts-$scriptsversion
 	make DESTDIR=$PKG install
 	# Rename network script
 	mv $PKG/etc/rc.d/init.d/{network,iplink}
@@ -234,4 +235,6 @@ EOF
 	mv $PKG/etc/rc.d/rcS.d/S{30,20}checkfs
 	mv $PKG/etc/rc.d/rcS.d/S{40,30}mountfs
 	sed "s|notmpfs,nosysfs,nodevtmpfs|notmpfs,nosysfs,nodevtmpfs,noproc|" -i $PKG/etc/rc.d/init.d/mountfs
+
+	echo "${lfs_release}" > $PKG/etc/lfs-release
 }