aaabasicfs 2012-1 màj

8 files changed, 382 insertions, 207 deletions

diff --git a/aaabasicfs/.footprint.i686 b/aaabasicfs/.footprint.i686
index b462f558b..9a697a0a4 100644
--- a/aaabasicfs/.footprint.i686
+++ b/aaabasicfs/.footprint.i686
@@ -11,6 +11,7 @@ drwxr-xr-x	root/root	etc/default/
 -rw-r--r--	root/root	etc/default/useradd
 -rw-r--r--	root/root	etc/fstab
 -rw-r--r--	root/root	etc/group
+lrwxrwxrwx	root/root	etc/init.d -> rc.d/init.d
 -rw-r--r--	root/root	etc/inittab
 -rw-r--r--	root/root	etc/inputrc
 drwxr-xr-x	root/root	etc/modprobe.d/
@@ -30,7 +31,6 @@ drwxr-xr-x	root/root	etc/rc.d/init.d/
 -rwxr-xr--	root/root	etc/rc.d/init.d/checkfs
 -rwxr-xr--	root/root	etc/rc.d/init.d/cleanfs
 -rwxr-xr--	root/root	etc/rc.d/init.d/console
--rwxr-xr--	root/root	etc/rc.d/init.d/consolelog
 -rw-r--r--	root/root	etc/rc.d/init.d/functions
 -rwxr-xr--	root/root	etc/rc.d/init.d/halt
 -rwxr-xr--	root/root	etc/rc.d/init.d/iplink
@@ -88,20 +88,19 @@ lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S70swap -> ../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
-drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S01mountvirtfs -> ../init.d/mountvirtfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S02consolelog -> ../init.d/consolelog
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S05modules -> ../init.d/modules
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S10udev -> ../init.d/udev
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S15setclock -> ../init.d/setclock
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S20checkfs -> ../init.d/checkfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S30mountfs -> ../init.d/mountfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S40swap -> ../init.d/swap
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S45cleanfs -> ../init.d/cleanfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S50udev_retry -> ../init.d/udev_retry
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S70console -> ../init.d/console
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S80localnet -> ../init.d/localnet
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S90sysctl -> ../init.d/sysctl
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S01mountvirtfs -> ../init.d/mountvirtfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S05modules -> ../init.d/modules
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S08localnet -> ../init.d/localnet
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S10udev -> ../init.d/udev
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S15setclock -> ../init.d/setclock
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S20checkfs -> ../init.d/checkfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S30mountfs -> ../init.d/mountfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S40swap -> ../init.d/swap
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S45cleanfs -> ../init.d/cleanfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S50udev_retry -> ../init.d/udev_retry
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S70console -> ../init.d/console
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S90sysctl -> ../init.d/sysctl
 -rw-r--r--	root/root	etc/shells
 drwxr-xr-x	root/root	etc/skel/
 -rw-r--r--	root/root	etc/skel/.bash_profile
@@ -110,16 +109,17 @@ drwxr-xr-x	root/root	etc/skel/
 drwxr-xr-x	root/root	etc/skel/Desktop/
 drwxr-xr-x	root/root	etc/sysconfig/
 -rw-r--r--	root/root	etc/sysconfig/modules
-drwxr-xr-x	root/root	etc/sysconfig/network-devices/
--rwxr-xr--	root/root	etc/sysconfig/network-devices/ifdown
--rwxr-xr--	root/root	etc/sysconfig/network-devices/ifup
-drwxr-xr-x	root/root	etc/sysconfig/network-devices/services/
--rwxr-xr--	root/root	etc/sysconfig/network-devices/services/ipv4-static
--rwxr-xr--	root/root	etc/sysconfig/network-devices/services/ipv4-static-route
 -rw-r--r--	root/root	etc/sysconfig/rc
+-rw-r--r--	root/root	etc/sysconfig/rc.site
+-rw-r--r--	root/root	etc/sysconfig/udev_retry
 drwxr-xr-x	root/root	home/
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
+lrwxrwxrwx	root/root	lib/lsb -> services
+drwxr-xr-x	root/root	lib/services/
+-rw-r--r--	root/root	lib/services/init-functions
+-rwxr-xr--	root/root	lib/services/ipv4-static
+-rwxr-xr--	root/root	lib/services/ipv4-static-route
 drwxr-xr-x	root/root	lib/udev/
 drwxr-xr-x	root/root	lib/udev/devices/
 crw-------	root/root	lib/udev/devices/console (5, 1)
@@ -127,6 +127,7 @@ crw-rw-rw-	root/root	lib/udev/devices/null (1, 3)
 drwxr-xr-x	root/root	lib/udev/devices/pts/
 drwxr-xr-x	root/root	lib/udev/devices/shm/
 crw-rw-rw-	root/root	lib/udev/devices/zero (1, 5)
+lrwxrwxrwx	root/root	lib64 -> lib
 drwxr-xr-x	root/root	media/
 drwxr-xr-x	root/root	media/cdrom/
 drwxr-xr-x	root/root	media/dvd/
@@ -164,6 +165,8 @@ lrwxrwxrwx	root/root	root/useradd -> ../etc/default/useradd
 drwxr-xr-x	root/root	run/
 -rw-rw-r--	root/utmp	run/utmp (EMPTY)
 drwxr-xr-x	root/root	sbin/
+-rwxr-xr--	root/root	sbin/ifdown
+-rwxr-xr--	root/root	sbin/ifup
 drwxr-xr-x	root/root	srv/
 drwxrwxrwt	root/root	srv/sources/
 drwxr-xr-x	root/root	sys/
@@ -176,6 +179,7 @@ lrwxrwxrwx	root/root	usr/doc -> share/doc
 drwxr-xr-x	root/root	usr/include/
 lrwxrwxrwx	root/root	usr/info -> share/info
 drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib64 -> lib
 drwxr-xr-x	root/root	usr/local/
 drwxr-xr-x	root/root	usr/local/bin/
 lrwxrwxrwx	root/root	usr/local/doc -> share/doc
@@ -218,6 +222,8 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 drwxr-xr-x	root/root	usr/share/man/man6/
 drwxr-xr-x	root/root	usr/share/man/man7/
 drwxr-xr-x	root/root	usr/share/man/man8/
+lrwxrwxrwx	root/root	usr/share/man/man8/ifdown.8.gz -> ifup.8.gz
+-rwxr-xr--	root/root	usr/share/man/man8/ifup.8.gz
 drwxr-xr-x	root/root	usr/share/misc/
 drwxr-xr-x	root/root	usr/share/terminfo/
 drwxr-xr-x	root/root	usr/share/zoneinfo/
diff --git a/aaabasicfs/.footprint.x86_64 b/aaabasicfs/.footprint.x86_64
index df967926b..9a697a0a4 100644
--- a/aaabasicfs/.footprint.x86_64
+++ b/aaabasicfs/.footprint.x86_64
@@ -11,6 +11,7 @@ drwxr-xr-x	root/root	etc/default/
 -rw-r--r--	root/root	etc/default/useradd
 -rw-r--r--	root/root	etc/fstab
 -rw-r--r--	root/root	etc/group
+lrwxrwxrwx	root/root	etc/init.d -> rc.d/init.d
 -rw-r--r--	root/root	etc/inittab
 -rw-r--r--	root/root	etc/inputrc
 drwxr-xr-x	root/root	etc/modprobe.d/
@@ -30,7 +31,6 @@ drwxr-xr-x	root/root	etc/rc.d/init.d/
 -rwxr-xr--	root/root	etc/rc.d/init.d/checkfs
 -rwxr-xr--	root/root	etc/rc.d/init.d/cleanfs
 -rwxr-xr--	root/root	etc/rc.d/init.d/console
--rwxr-xr--	root/root	etc/rc.d/init.d/consolelog
 -rw-r--r--	root/root	etc/rc.d/init.d/functions
 -rwxr-xr--	root/root	etc/rc.d/init.d/halt
 -rwxr-xr--	root/root	etc/rc.d/init.d/iplink
@@ -88,20 +88,19 @@ lrwxrwxrwx	root/root	etc/rc.d/rc6.d/S70swap -> ../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
-drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S01mountvirtfs -> ../init.d/mountvirtfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S02consolelog -> ../init.d/consolelog
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S05modules -> ../init.d/modules
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S10udev -> ../init.d/udev
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S15setclock -> ../init.d/setclock
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S20checkfs -> ../init.d/checkfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S30mountfs -> ../init.d/mountfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S40swap -> ../init.d/swap
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S45cleanfs -> ../init.d/cleanfs
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S50udev_retry -> ../init.d/udev_retry
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S70console -> ../init.d/console
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S80localnet -> ../init.d/localnet
-lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S90sysctl -> ../init.d/sysctl
+drwxr-xr-x	root/root	etc/rc.d/rcS.d/
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S01mountvirtfs -> ../init.d/mountvirtfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S05modules -> ../init.d/modules
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S08localnet -> ../init.d/localnet
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S10udev -> ../init.d/udev
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S15setclock -> ../init.d/setclock
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S20checkfs -> ../init.d/checkfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S30mountfs -> ../init.d/mountfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S40swap -> ../init.d/swap
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S45cleanfs -> ../init.d/cleanfs
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S50udev_retry -> ../init.d/udev_retry
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S70console -> ../init.d/console
+lrwxrwxrwx	root/root	etc/rc.d/rcS.d/S90sysctl -> ../init.d/sysctl
 -rw-r--r--	root/root	etc/shells
 drwxr-xr-x	root/root	etc/skel/
 -rw-r--r--	root/root	etc/skel/.bash_profile
@@ -110,16 +109,17 @@ drwxr-xr-x	root/root	etc/skel/
 drwxr-xr-x	root/root	etc/skel/Desktop/
 drwxr-xr-x	root/root	etc/sysconfig/
 -rw-r--r--	root/root	etc/sysconfig/modules
-drwxr-xr-x	root/root	etc/sysconfig/network-devices/
--rwxr-xr--	root/root	etc/sysconfig/network-devices/ifdown
--rwxr-xr--	root/root	etc/sysconfig/network-devices/ifup
-drwxr-xr-x	root/root	etc/sysconfig/network-devices/services/
--rwxr-xr--	root/root	etc/sysconfig/network-devices/services/ipv4-static
--rwxr-xr--	root/root	etc/sysconfig/network-devices/services/ipv4-static-route
 -rw-r--r--	root/root	etc/sysconfig/rc
+-rw-r--r--	root/root	etc/sysconfig/rc.site
+-rw-r--r--	root/root	etc/sysconfig/udev_retry
 drwxr-xr-x	root/root	home/
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
+lrwxrwxrwx	root/root	lib/lsb -> services
+drwxr-xr-x	root/root	lib/services/
+-rw-r--r--	root/root	lib/services/init-functions
+-rwxr-xr--	root/root	lib/services/ipv4-static
+-rwxr-xr--	root/root	lib/services/ipv4-static-route
 drwxr-xr-x	root/root	lib/udev/
 drwxr-xr-x	root/root	lib/udev/devices/
 crw-------	root/root	lib/udev/devices/console (5, 1)
@@ -165,6 +165,8 @@ lrwxrwxrwx	root/root	root/useradd -> ../etc/default/useradd
 drwxr-xr-x	root/root	run/
 -rw-rw-r--	root/utmp	run/utmp (EMPTY)
 drwxr-xr-x	root/root	sbin/
+-rwxr-xr--	root/root	sbin/ifdown
+-rwxr-xr--	root/root	sbin/ifup
 drwxr-xr-x	root/root	srv/
 drwxrwxrwt	root/root	srv/sources/
 drwxr-xr-x	root/root	sys/
@@ -220,6 +222,8 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 drwxr-xr-x	root/root	usr/share/man/man6/
 drwxr-xr-x	root/root	usr/share/man/man7/
 drwxr-xr-x	root/root	usr/share/man/man8/
+lrwxrwxrwx	root/root	usr/share/man/man8/ifdown.8.gz -> ifup.8.gz
+-rwxr-xr--	root/root	usr/share/man/man8/ifup.8.gz
 drwxr-xr-x	root/root	usr/share/misc/
 drwxr-xr-x	root/root	usr/share/terminfo/
 drwxr-xr-x	root/root	usr/share/zoneinfo/
diff --git a/aaabasicfs/.md5sum.i686 b/aaabasicfs/.md5sum.i686
index 8695b73fd..fcc09fa56 100644
--- a/aaabasicfs/.md5sum.i686
+++ b/aaabasicfs/.md5sum.i686
@@ -2,17 +2,17 @@
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
-8026923cf29639bf6ac5a2b77bec74dc  blfs-bootscripts-20100825.tar.bz2
+729c361edcbb1731cb1d7453f913edf9  blfs-bootscripts-20120217.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 64514eb39b4878f060065cab28191ee5  fstab
-4e641aa7a51f285c0a832b8a7dd8ed29  inittab
+ccedc7098a844e92db6bd179f13f550b  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 f05a15125a4c6008471d96b096445e21  lfs-bootscripts-03.patch
-5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
-ca5159eb45e407362a6bf4ad47d8fc21  network
+9dd71c43f58143229d9f7b4025974dc9  lfs-bootscripts-20120229.tar.bz2
+f0d82fd62e5dfc628addb1c6f4617b6e  network
 c661d321ada89d6a2f1a1dde39f00a25  nu
 210fdabd07248f79617508807715167b  profile
-b860cf492e983f400666fa43c00f2954  rc
+30dd8d7e2b5749ab447e7c902e318248  rc
 fa6ce99e0329c7854e0a83d022da6fe3  readline.sh
 87a81331c2241707ab494584eb49a80b  unmask.sh
diff --git a/aaabasicfs/.md5sum.x86_64 b/aaabasicfs/.md5sum.x86_64
index 8695b73fd..fcc09fa56 100644
--- a/aaabasicfs/.md5sum.x86_64
+++ b/aaabasicfs/.md5sum.x86_64
@@ -2,17 +2,17 @@
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
-8026923cf29639bf6ac5a2b77bec74dc  blfs-bootscripts-20100825.tar.bz2
+729c361edcbb1731cb1d7453f913edf9  blfs-bootscripts-20120217.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 64514eb39b4878f060065cab28191ee5  fstab
-4e641aa7a51f285c0a832b8a7dd8ed29  inittab
+ccedc7098a844e92db6bd179f13f550b  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 f05a15125a4c6008471d96b096445e21  lfs-bootscripts-03.patch
-5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
-ca5159eb45e407362a6bf4ad47d8fc21  network
+9dd71c43f58143229d9f7b4025974dc9  lfs-bootscripts-20120229.tar.bz2
+f0d82fd62e5dfc628addb1c6f4617b6e  network
 c661d321ada89d6a2f1a1dde39f00a25  nu
 210fdabd07248f79617508807715167b  profile
-b860cf492e983f400666fa43c00f2954  rc
+30dd8d7e2b5749ab447e7c902e318248  rc
 fa6ce99e0329c7854e0a83d022da6fe3  readline.sh
 87a81331c2241707ab494584eb49a80b  unmask.sh
diff --git a/aaabasicfs/Pkgfile b/aaabasicfs/Pkgfile
index 7a476cd96..ec8976557 100644
--- a/aaabasicfs/Pkgfile
+++ b/aaabasicfs/Pkgfile
@@ -4,15 +4,15 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=aaabasicfs
-version=2011
-release=4
-scriptsversion=lfs-bootscripts-20110424
-BLFSscriptsversion=20100825
+version=2012
+release=1
+scriptsversion=lfs-bootscripts-20120229
+BLFSscriptsversion=20120217
 XORG_PREFIX=/usr
-source=(http://nutyx.meticul.eu/files/patchs/$name/$scriptsversion.tar.bz2 \
-        http://nutyx.meticul.eu/files/patchs/$name/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 \
-	http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch \
-        fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh \
+source=(http://www.linuxfromscratch.org/lfs/downloads/7.1/$scriptsversion.tar.bz2
+	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
+	http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch
+	fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh
 	bash_profile bashrc bashrc.etc nu readline.sh unmask.sh X.sh )
 
 
@@ -162,7 +162,6 @@ EOF
 	chmod -v 664 $PKG/var/run/utmp $PKG/var/log/lastlog
 	# Bootscripts
 	cd $scriptsversion
-	patch -Np1 -i ../lfs-bootscripts-03.patch
 	make DESTDIR=$PKG install
 	# Rename network script
 	mv $PKG/etc/rc.d/init.d/{network,iplink}
@@ -171,7 +170,7 @@ EOF
 	# We want to start the network when init 2
 	mv $PKG/etc/rc.d/rc2.d/{K80,S20}network
 	cd ..	
-	# Remove files which will be installed by xorg7
+	# Remove files which will be installed by xorg
 	rm $PKG/etc/sysconfig/createfiles
 
 	# Configuration files
@@ -231,9 +230,10 @@ EOF
 			mv $PKG/etc/rc.d/$i/S{80,70}swap
 			mv $PKG/etc/rc.d/$i/S{70,80}mountfs
 	done
-	ln -s ../init.d/setclock $PKG/etc/rc.d/rcsysinit.d/S15setclock
-	mv $PKG/etc/rc.d/rcsysinit.d/S{00,01}mountvirtfs
-	mv $PKG/etc/rc.d/rcsysinit.d/S{20,40}swap
-	mv $PKG/etc/rc.d/rcsysinit.d/S{30,20}checkfs
-	mv $PKG/etc/rc.d/rcsysinit.d/S{40,30}mountfs
+	ln -s ../init.d/setclock $PKG/etc/rc.d/rcS.d/S15setclock
+	mv $PKG/etc/rc.d/rcS.d/S{00,01}mountvirtfs
+	mv $PKG/etc/rc.d/rcS.d/S{20,40}swap
+	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
 }
diff --git a/aaabasicfs/inittab b/aaabasicfs/inittab
index d8dac783a..4b8364a98 100644
--- a/aaabasicfs/inittab
+++ b/aaabasicfs/inittab
@@ -5,7 +5,7 @@
 
 id:3:initdefault:
 
-si::sysinit:/etc/rc.d/init.d/rc sysinit
+si::sysinit:/etc/rc.d/init.d/rc S
 
 l0:0:wait:/etc/rc.d/init.d/rc 0
 l1:S1:wait:/etc/rc.d/init.d/rc 1
@@ -19,7 +19,7 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now
 
 su:S016:once:/sbin/sulogin
 
-1:2345:respawn:/sbin/agetty tty1 9600
+1:2345:respawn:/sbin/agetty --noclear tty1 9600
 2:2345:respawn:/sbin/agetty tty2 9600
 3:2345:respawn:/sbin/agetty tty3 9600
 4:2345:respawn:/sbin/agetty tty4 9600
diff --git a/aaabasicfs/network b/aaabasicfs/network
index 8340cd68e..75531640b 100755
--- a/aaabasicfs/network
+++ b/aaabasicfs/network
@@ -1,39 +1,63 @@
 #!/bin/sh
-# Begin $rc_base/init.d/network
+########################################################################
+# Begin network
+#
+# Description : Network Control Script
+#
+# Authors     : Gerard Beekmans - gerard@linuxfromscratch.org
+#               Nathan Coulson - nathan@linuxfromscratch.org
+#               Kevin P. Fleming - kpfleming@linuxfromscratch.org
+#               DJ Lucas - dj@linuxfromscratch.org
+# Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
+#
+# Changes for NuTyX : piernov - piernov@piernov.org
+#
+# Version     : LFS 7.0
+#
+########################################################################
 
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by thierryn1@hispeed.ch
+### BEGIN INIT INFO
+# Provides:            $network
+# Required-Start:      $local_fs swap localnet
+# Should-Start:        $syslog
+# Required-Stop:       $local_fs swap localnet
+# Should-Stop:         $syslog
+# Default-Start:       2 3 4 5
+# Default-Stop:        0 1 6
+# Short-Description:   Starts and configures network interfaces.
+# Description:         Starts and configures network interfaces.
+# X-LFS-Provided-By:   LFS
+### END INIT INFO
 
-. /etc/sysconfig/rc
-. $rc_functions
+. /lib/lsb/init-functions
 
 # Network configuration
 . /etc/sysconfig/network
 
 NM_PIDFILE=/var/run/NetworkManager.pid
 WICD_PIDFILE=
-
 TIME=$NETWORKDELAY
-case "$1" in
-	start)
+
+case "${1}" in
+   start)
 		if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
-			boot_mesg "Setting network parameters... "
-			sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-			echo_ok
 
-			boot_mesg "Starting NetworkManager daemon..."
-			loadproc NetworkManager --pid-file $NM_PIDFILE
+			log_info_msg "Starting NetworkManager daemon..."
+			start_daemon /usr/sbin/NetworkManager --pid-file $NM_PIDFILE
+			evaluate_retval
+
 			if [ "${NETWORKWAIT}" == "yes" ]; then 
 				[ -z "${LINKDELAY}" ] && LINKDELAY=10
-				boot_mesg "Waiting for network..."
+				log_info_msg "Waiting for network..."
 				nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30
-				[ "$?" = "0" ] && log_success_msg "Network startup" || log_failure_msg "Network startup"
+				evaluate_retval
 				[ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY}
 			fi
 
 		elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
-			boot_mesg "Starting the wicd Daemon..."
-			loadproc /usr/share/wicd/daemon/wicd-daemon.py
+			log_info_msg "Starting the wicd Daemon..."
+			start_daemon /usr/share/wicd/daemon/wicd-daemon.py
+			evaluate_retval
 				if grep -v ^# /etc/fstab | grep _netdev > /dev/null; then
 					while ! grep "nameserver" /etc/resolv.conf ;
 						do
@@ -42,55 +66,82 @@ case "$1" in
 								echo -n .
 								let TIME=$TIME-1
 								if [ $TIME -lt 1 ]; then
-									boot_mesg "Time out"
-									echo_failure
+									log_failure_msg "Time out"
 									exit 1
 								fi
 							fi
 						done
-					boot_mesg "Network successfully configured..."
-					echo_ok
+					log_success_msg "Network successfully configured..."
 				fi
 		
-		else 
-			if  [ -f /etc/rc.d/init.d/iplink ]; then
-				/etc/rc.d/init.d/iplink start
-			fi
-		fi
-		;;
+		else
+          # Start all network interfaces
+          for file in /etc/sysconfig/ifconfig.*
+          do
+             interface=${file##*/ifconfig.}
 
-	stop)
-		if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
-			boot_mesg "Stopping NetworkManager daemon..."
-			killproc -p $NM_PIDFILE NetworkManager
+             # Skip if $file is * (because nothing was found)
+             if [ "${interface}" = "*" ]
+             then
+                continue
+             fi
+
+             /sbin/ifup ${interface}
+          done
+      fi
+      ;;
+
+   stop)
+        if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
+			log_info_msg "Stopping NetworkManager daemon..."
+			killproc -p $NM_PIDFILE /usr/sbin/NetworkManager
+			evaluate_retval
 		elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
-			boot_mesg "Stopping the wicd Daemon..."
-			loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill
+			log_info_msg "Stopping the wicd Daemon..."
+			/usr/share/wicd/daemon/wicd-daemon.py --kill
+			evaluate_retval
 		else
-			if  [ -f /etc/rc.d/init.d/iplink ]; then
-				/etc/rc.d/init.d/iplink stop
-			fi
-		fi
-		;;
+          # Reverse list
+          net_files=""
+          for file in  /etc/sysconfig/ifconfig.*
+          do
+             net_files="${file} ${net_files}"
+          done
+
+          # Stop all network interfaces
+          for file in ${net_files}
+          do
+             interface=${file##*/ifconfig.}
+
+             # Skip if $file is * (because nothing was found)
+             if [ "${interface}" = "*" ]
+             then
+                continue
+             fi
+
+             /sbin/ifdown ${interface}
+          done
+        fi
+      ;;
 	status)
 		if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
 			statusproc -p $NM_PIDFILE NetworkManager
-		else
-			if [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
-				statusproc -p /var/run/wicd/wicd.pid "/usr/bin/python2 /usr/share/wicd/daemon/wicd-daemon.py"
-			fi
+		elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
+			statusproc -p /var/run/wicd/wicd.pid /usr/share/wicd/daemon/wicd-daemon.py
 		fi
 		;;
-	restart)
-		${0} stop
-		sleep 3
-		${0} start
-		;;
+   restart)
+      ${0} stop
+      sleep 3
+      ${0} start
+      ;;
 
-	*)
-		echo "Usage: $0 {start|stop|restart|status}"
-		exit 1
-		;;
+   *)
+      echo "Usage: ${0} {start|stop|restart|status}"
+      exit 1
+      ;;
 esac
 
-# End $rc_base/init.d/network
+exit 0
+
+# End network
diff --git a/aaabasicfs/rc b/aaabasicfs/rc
index 81736e9f5..0b201cbbf 100755
--- a/aaabasicfs/rc
+++ b/aaabasicfs/rc
@@ -1,112 +1,226 @@
 #!/bin/sh
 ########################################################################
-# Begin $rc_base/init.d/rc
+# Begin rc
 #
 # Description : Main Run Level Control Script
 #
 # Authors     : Gerard Beekmans  - gerard@linuxfromscratch.org
+#             : DJ Lucas - dj@linuxfromscratch.org
+# Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
 #
-# Version     : 00.00
-#
-# Notes       :
+# Version     : LFS 7.0
 #
 ########################################################################
 
-. /etc/sysconfig/rc
-. ${rc_functions}
+. /lib/lsb/init-functions
+
+print_error_msg()
+{
+   log_failure_msg
+   # $i is set when called
+   MSG="FAILURE:\n\nYou should not be reading this error message.\n\n" 
+   MSG="${MSG}It means that an unforeseen error took place in\n"
+   MSG="${MSG}${i},\n"
+   MSG="${MSG}which exited with a return value of ${error_value}.\n"
+  
+   MSG="${MSG}If you're able to track this error down to a bug in one of\n"
+   MSG="${MSG}the files provided by the files provided by\n"
+   MSG="${MSG}the ${DISDRI_MINI} book, please be so kind to inform us at\n"
+   MSG="${MSG}${DISTRO_CONTACT}.\n"
+   log_failure_msg "${MSG}"
+
+   log_info_msg "Press Enter to continue..."
+   wait_for_user
+}
 
-stty sane
+check_script_status()
+{
+   # $i is set when called
+   if [ ! -f ${i} ]; then
+      log_warning_msg "${i} is not a valid symlink." 
+      continue
+   fi
+
+   if [ ! -x ${i} ]; then
+      log_warning_msg "${i} is not executable, skipping."
+      continue
+   fi
+}
+
+run()
+{
+   if [ -z $interactive ]; then
+      ${1} ${2}
+      return $?
+   fi
+
+   while true; do
+      read -p "Run ${1} ${2} (Yes/no/continue)? " -n 1 runit
+      echo
+
+      case ${runit} in
+         c | C)
+            interactive=""
+            ${i} ${2}
+            ret=${?}
+            break;
+            ;;
+
+         n | N)
+            return 0
+            ;;
+
+         y | Y)
+            ${i} ${2}
+            ret=${?}
+            break
+            ;;
+      esac
+   done
+
+   return $ret
+}
 
+# Read any local settings/overrides
+[ -r /etc/sysconfig/rc.site ] && source /etc/sysconfig/rc.site
+
+DISTRO=${DISTRO:-"NuTyX"}
+DISTRO_CONTACT=${DISTRO_CONTACT:-"http://nutyx.org/"}
+DISTRO_MINI=${DISTRO_MINI:-"NuTyX"}
+IPROMPT=${IPROMPT:-"no"}
+
+# These 3 signals will not cause our script to exit
 trap "" INT QUIT TSTP
 
-[ "${1}" != "" ]  && runlevel=${1}
-
-splashy_update_progress(){
-    STEPS_DIR=/etc/splashy/steps_dir
-    [ -r "/etc/default/splashy" ] && . "/etc/default/splashy"
-    SPL_UPD=/sbin/splashy_update
-    SPL_PRG=$STEPS_DIR/${runlevel}-progress
-    # load some default variables
-    if ! ( pidof splashy > /dev/null ); then
-	 /sbin/splashy boot 2>/dev/null
-	sleep 1
-    else
-    	PER=`sed -n 's+'${1}' ++ p' $SPL_PRG`
-    	$SPL_UPD "progress $PER"
-    fi
-}
+[ "${1}" != "" ] && runlevel=${1}
 
-if [ "${runlevel}" = "" ]; then
-	echo "Usage: ${0} <runlevel>" >&2
-	exit 1
+if [ "${runlevel}" == "" ]; then
+   echo "Usage: ${0} <runlevel>" >&2
+   exit 1
 fi
 
 previous=${PREVLEVEL}
-[ "${previous}" = "" ] && previous=N
+[ "${previous}" == "" ] && previous=N
 
-if [ ! -d ${rc_base}/rc${runlevel}.d ]; then
-	boot_mesg "${rc_base}/rc${runlevel}.d does not exist." ${WARNING}
-	boot_mesg_flush
-	exit 1
+if [ ! -d /etc/rc.d/rc${runlevel}.d ]; then
+   log_info_msg "/etc/rc.d/rc${runlevel}.d does not exist.\n" 
+   exit 1
 fi
-# Attempt to stop all service started by previous runlevel,
+
+if [ "$runlevel" == "6" -o "$runlevel" == "0" ]; then IPROMPT="no"; fi
+
+# Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7
+if [ "$runlevel" == "S" ]; then dmesg -n "${LOGLEVEL:-1}"; fi
+
+if [ "${IPROMPT}" == "yes" -a "${runlevel}" == "S" ]; then
+   # The total length of the distro welcome string, without escape codes
+   wlen=${wlen:-$(echo "Welcome to ${DISTRO}" | wc -c )}
+   welcome_message=${welcome_message:-"Welcome to ${INFO}${DISTRO}${NORMAL}"}
+
+   # The total length of the interactive string, without escape codes
+   ilen=${ilen:-$(echo "Press 'I' to enter interactive startup" | wc -c )}
+   i_message=${i_message:-"Press '${FAILURE}I${NORMAL}' to enter interactive startup"}
+
+
+   # dcol and icol are spaces before the message to center the message
+   # on screen. itime is the amount of wait time for the user to press a key
+   wcol=$(( ( ${COLUMNS} - ${wlen} ) / 2 ))
+   icol=$(( ( ${COLUMNS} - ${ilen} ) / 2 ))
+   itime=${itime:-"3"}
+
+   echo -e "\n\n"
+   echo -e "\\033[${wcol}G${welcome_message}"
+   echo -e "\\033[${icol}G${i_message}${NORMAL}"
+   echo ""
+   read -t "${itime}" -n 1 interactive 2>&1 > /dev/null
+fi
+
+# Make lower case
+[ "${interactive}" == "I" ] && interactive="i"
+[ "${interactive}" != "i" ] && interactive=""
+
+# Read the state file if it exists from runlevel S
+[ -r /var/run/interactive ] && source /var/run/interactive
+
+# Attempt to stop all services started by the previous runlevel,
 # and killed in this runlevel
 if [ "${previous}" != "N" ]; then
-	for i in $(ls -v ${rc_base}/rc${runlevel}.d/K* 2> /dev/null)
-	do
-		check_script_status
-
-		suffix=${i#$rc_base/rc$runlevel.d/K[0-9][0-9]}
-		prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix
-		sysinit_start=$rc_base/rcsysinit.d/S[0-9][0-9]$suffix
-
-		if [ "${runlevel}" != "0" ] && [ "${runlevel}" != "6" ]; then
-			if [ ! -f ${prev_start} ] && [ ! -f ${sysinit_start} ]; then
-				boot_mesg -n "WARNING:\n\n${i} can't be" ${WARNING}
-				boot_mesg -n " executed because it was not"
-				boot_mesg -n " not started in the previous"
-				boot_mesg -n " runlevel (${previous})."
-				boot_mesg "" ${NORMAL}
-				boot_mesg_flush
-				continue
-			fi
-		fi
-		${i} stop
-		error_value=${?}
-
-		if [ "${error_value}" != "0" ]; then
-			print_error_msg
-		fi
-	done
+   for i in $(ls -v /etc/rc.d/rc${runlevel}.d/K* 2> /dev/null)
+   do
+      check_script_status
+
+      suffix=${i#/etc/rc.d/rc$runlevel.d/K[0-9][0-9]}
+      prev_start=/etc/rc.d/rc$previous.d/S[0-9][0-9]$suffix
+      sysinit_start=/etc/rc.d/rcS.d/S[0-9][0-9]$suffix
+
+      if [ "${runlevel}" != "0" -a "${runlevel}" != "6" ]; then
+         if [ ! -f ${prev_start} -a  ! -f ${sysinit_start} ]; then
+            MSG="WARNING:\n\n${i} can't be "
+            MSG="${MSG}executed because it was not "
+            MSG="${MSG}not started in the previous "
+            MSG="${MSG}runlevel (${previous})."
+            log_warning_msg "$MSG"
+            continue
+         fi
+      fi
+
+      run ${i} stop
+      error_value=${?}
+
+      if [ "${error_value}" != "0" ]; then print_error_msg; fi
+   done
+fi
+
+if [ "${previous}" == "N" ]; then export IN_BOOT=1; fi
+
+if [ "$runlevel" == "6" -a -n "${FASTBOOT}" ]; then
+   touch /fastboot
 fi
 
-#Start all functions in this runlevel
-for i in $( ls -v ${rc_base}/rc${runlevel}.d/S* 2> /dev/null)
+
+# Start all functions in this runlevel
+for i in $( ls -v /etc/rc.d/rc${runlevel}.d/S* 2> /dev/null)
 do
-	if [ "${previous}" != "N" ]; then
-		suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]}
-		stop=$rc_base/rc$runlevel.d/K[0-9][0-9]$suffix
-		prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix
-
-		[ -f ${prev_start} ] && [ ! -f ${stop} ] && continue
-	fi
-
-	check_script_status
-
-	case ${runlevel} in
-		0|6)
-			[ -f /sbin/splashy ] && splashy_update_progress ${i}
-			${i} stop
-			;;
-		*)
-			[ -f /sbin/splashy ] && splashy_update_progress ${i}
-			${i} start
-			;;
-	esac
-	error_value=${?}
-
-	if [ "${error_value}" != "0" ]; then
-		print_error_msg
-	fi
+   if [ "${previous}" != "N" ]; then
+      suffix=${i#/etc/rc.d/rc$runlevel.d/S[0-9][0-9]}
+      stop=/etc/rc.d/rc$runlevel.d/K[0-9][0-9]$suffix
+      prev_start=/etc/rc.d/rc$previous.d/S[0-9][0-9]$suffix
+
+      [ -f ${prev_start} -a ! -f ${stop} ] && continue
+   fi
+
+   check_script_status
+
+   case ${runlevel} in
+      0|6)
+         run ${i} stop
+         ;;
+      *)
+         run ${i} start
+         ;;
+   esac
+
+   error_value=${?}
+
+   if [ "${error_value}" != "0" ]; then print_error_msg; fi
 done
-# End $rc_base/init.d/rc
+
+# Store interactive variable on switch from runlevel S and remove if not
+if [ "${runlevel}" == "S" -a "${interactive}" == "i" ]; then
+    echo "interactive=\"i\"" > /var/run/interactive
+else
+    rm -f /var/run/interactive 2> /dev/null
+fi
+
+# Copy the boot log on initial boot only
+if [ "${previous}" == "N" -a  "${runlevel}" != "S" ]; then
+   cat /run/var/bootlog >> /var/log/boot.log
+      
+   # Mark the end of boot
+   echo "--------" >> /var/log/boot.log
+   
+   # Remove the temporary file
+   rm -f /run/var/bootlog 2> /dev/null
+fi
+
+# End rc