maj aaabasicfs#04072010-1

6 files changed, 45 insertions, 12 deletions

diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index 74c2fa46e..109471f5d 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -153,6 +153,7 @@ 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/
 -rwxr-xr-x	root/root	root/bin/nu
+-rwxr-xr-x	root/root	root/bin/splashy_stop
 lrwxrwxrwx	root/root	root/clock -> ../etc/sysconfig/clock
 lrwxrwxrwx	root/root	root/console -> ../etc/sysconfig/console
 lrwxrwxrwx	root/root	root/dircolors.sh -> ../etc/profile.d/dircolors.sh
diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 76781fea9..361872dab 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -8,14 +8,15 @@ f6b42961b3c2bd3b2e0bf0082d80d216  X.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 0286a09ca5d7515c29ad5ff8f88fb9f3  fstab
 57ddbea584220ac4e74d0504a03721f4  hosts
-51b048247011e2286992e4408dc5118d  inittab
+36fa9b5875179167457886be0f816a35  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
-5d7c952bd09d718298dd60d3b976c349  lfs-bootscripts-01.patch
-472830fe082dc77a1d30c8b2bd6b5079  lfs-bootscripts-20100529.tar.bz2
+7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
+4e2813dd1b50f16f64e6e9f8455fc6aa  lfs-bootscripts-20100627.tar.bz2
 4e77d38062489bdd53d0eb9065a37b3e  message
 f6c548de7fc44b0fbc503ba0189d5c91  network
 4f193837349d63e6c98501f221904170  nu
 210fdabd07248f79617508807715167b  profile
 8581f546f9dce86f2f04be09cc7773ad  rc
 fa6ce99e0329c7854e0a83d022da6fe3  readline.sh
+3abdd4fb506d50cc5fabdc362dc61925  splashy_stop
 87a81331c2241707ab494584eb49a80b  unmask.sh
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 1b65ea798..555dc7a4e 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,13 +5,13 @@
 
 name=aaabasicfs
 version=2010
-release=rc2
-scriptsversion=lfs-bootscripts-20100529
+release=04072010
+scriptsversion=lfs-bootscripts-20100627
 BLFSscriptsversion=20090302
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
 	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
- hosts fstab inittab message inputrc network rc \
- profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \
+ hosts fstab inittab message inputrc network rc splashy_stop\
+ profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-02.patch \
  nu readline.sh unmask.sh X.sh bashrc )
 
 
@@ -66,7 +66,7 @@ named:x:20:20:BIND Owner:/home/named:/bin/false
 gdm:x:21:21:GDM Daemon User:/dev/null:/bin/bash
 fcron:x:22:22:Fcron User:/dev/null:/bin/false
 kdm:x:23:23:KDM Daemon User:/dev/null:/bin/bash
-fpache:x:25:25:Apache Server:/dev/null:/bin/false
+apache:x:25:25:Apache Server:/dev/null:/bin/false
 smmsp:x:26:26:Sendmail Daemon:/dev/null:/bin/false
 polkituser:x:27:27:Policy Kit Daemon User:/dev/null:/bin/false
 mysql:x:40:40:MySQL Server:/dev/null/:bin/false
@@ -75,6 +75,7 @@ rsyncd:48:48:rsyncd Daemon:/home/rsync:/bin/false
 sshd:x:50:50:sshd PrivSep:/var/lib/sshd:/bin/false
 policykit:x:62:62:PolicyKit:/:/sbin/nologin
 tomcat:x:66:66:Tomcat Server:/opt/tomcat:/bin/false
+avahi:x:85.85:Avahi daemon:/:/bin/false
 clamav:x:97:97:Clamav Antivirus:/dev/null:/bin/false
 anonymous:x:98:1000::/home/anonymous:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false
@@ -119,6 +120,7 @@ fuse:x:65:
 tomcat:x:66:
 scanner:x:70:
 vboxusers:x:80:
+avahi:x:85:
 clamav:x:97:
 nogroup:x:99:
 users:x:100:
@@ -146,7 +148,7 @@ EOF
 	chmod -v 664 $PKG/var/run/utmp $PKG/var/log/lastlog
 	# Bootscripts
 	cd $scriptsversion
-	patch -Np1 -i ../lfs-bootscripts-01.patch
+	patch -Np1 -i ../lfs-bootscripts-02.patch
 	make DESTDIR=$PKG install
 	# Rename network script
 	mv $PKG/etc/rc.d/init.d/{network,iplink}
@@ -169,6 +171,7 @@ EOF
 	cp -v bash_profile $PKG/root/.bash_profile
 	cp -v bashrc $PKG/root/.bashrc
 	mkdir -p $PKG/root/bin
+	cp -v splashy_stop $PKG/root/bin
 	cp -v nu $PKG/root/bin
        # Customise startup scripts
 	cat > $PKG/var/lib/pkg/blfs-bootscripts << "EOF"
diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab
index 6bc32ce1e..2ee19a198 100644
--- a/base/aaabasicfs/inittab
+++ b/base/aaabasicfs/inittab
@@ -1,6 +1,6 @@
 # Begin /etc/inittab
-
-# Pour le lancement de slim: id:3
+# Pour le lancement de la console: id:2
+# Pour le lancement de qingy: id:3
 # Pour le lancement de gdm:  id:4
 # Pour le lancement de kdm:  id:5
 
@@ -42,7 +42,7 @@ su:S016:once:/sbin/sulogin
 
 30:5:respawn:/usr/bin/kdm
 
-sp:2345:once:/sbin/splashy_update "exit"
+sp:2345:once:/root/bin/splashy_stop
 
 
 # End /etc/inittab
diff --git a/base/aaabasicfs/lfs-bootscripts-01.patch b/base/aaabasicfs/lfs-bootscripts-02.patch
index 8e8163a0f..56ee98ec8 100644
--- a/base/aaabasicfs/lfs-bootscripts-01.patch
+++ b/base/aaabasicfs/lfs-bootscripts-02.patch
@@ -42,3 +42,27 @@
  		;;
  
  	reload)
+diff -Naur lfs-bootscripts-20100627-original/lfs/init.d/consolelog lfs-bootscripts-20100627/lfs/init.d/consolelog
+--- lfs-bootscripts-20100627-original/lfs/init.d/consolelog	2007-07-18 15:26:34.000000000 +0200
++++ lfs-bootscripts-20100627/lfs/init.d/consolelog	2010-07-04 16:13:04.000000000 +0200
+@@ -17,7 +17,7 @@
+ . ${rc_functions}
+ 
+ # set the default loglevel
+-LOGLEVEL=7
++LOGLEVEL=1
+ if [ -r /etc/sysconfig/console ]; then
+ 	. /etc/sysconfig/console
+ fi
+@@ -25,7 +25,10 @@
+ case "${1}" in
+ 	start)
+ 		case "$LOGLEVEL" in
+-		[1-8])
++		1)
++			dmesg -n $LOGLEVEL
++			;;
++		[2-8])
+ 			boot_mesg "Setting the console log level to ${LOGLEVEL}..."
+ 			dmesg -n $LOGLEVEL
+ 			evaluate_retval
diff --git a/base/aaabasicfs/splashy_stop b/base/aaabasicfs/splashy_stop
new file mode 100755
index 000000000..c6b366391
--- /dev/null
+++ b/base/aaabasicfs/splashy_stop
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -f /sbin/splashy_update ]; then
+	/sbin/splashy_update "exit"
+fi