Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

5 files changed, 8 insertions, 18 deletions

diff --git a/base/aaabasicfs/.footprint.i686 b/base/aaabasicfs/.footprint.i686
index 34f311a05..ffc6b3ac8 100644
--- a/base/aaabasicfs/.footprint.i686
+++ b/base/aaabasicfs/.footprint.i686
@@ -1,7 +1,6 @@
 drwxr-xr-x	root/root	bin/
 lrwxrwxrwx	root/root	bin/sh -> bash
 drwxr-xr-x	root/root	boot/
--rw-r--r--	root/root	boot/message
 drwxr-xr-x	root/root	dev/
 crw-------	root/root	dev/console (5, 1)
 crw-rw-rw-	root/root	dev/null (1, 3)
@@ -37,7 +36,7 @@ drwxr-xr-x	root/root	etc/rc.d/init.d/
 -rwxr-xr--	root/root	etc/rc.d/init.d/localnet
 -rwxr-xr--	root/root	etc/rc.d/init.d/modules
 -rwxr-xr--	root/root	etc/rc.d/init.d/mountfs
--rwxr-xr--	root/root	etc/rc.d/init.d/mountkernfs
+-rwxr-xr--	root/root	etc/rc.d/init.d/mountvirtfs
 -rwxr-xr-x	root/root	etc/rc.d/init.d/network
 -rwxr-xr--	root/root	etc/rc.d/init.d/random
 -rwxr-xr--	root/root	etc/rc.d/init.d/rc
@@ -89,7 +88,7 @@ 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/S01mountkernfs -> ../init.d/mountkernfs
+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
@@ -143,7 +142,6 @@ 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.i686 b/base/aaabasicfs/.md5sum.i686
index 2ca3d4683..0c2625d57 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -2,19 +2,17 @@ b9bdd0860e6e4810f5b5e094e4d50aa4  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
-deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
+b7f67cb6cdc94937e9a13fc22b387305  blfs-bootscripts-20100825.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 0286a09ca5d7515c29ad5ff8f88fb9f3  fstab
 1878700f891b205d12dd93bf86ab1739  inittab
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
-fce16832185920c8bea816cb2ebb2b28  lfs-bootscripts-20100627.tar.bz2
-ba5337b24f90372dba3d7211f8f25531  message
+5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
 f6c548de7fc44b0fbc503ba0189d5c91  network
 4f193837349d63e6c98501f221904170  nu
 210fdabd07248f79617508807715167b  profile
 b860cf492e983f400666fa43c00f2954  rc
 fa6ce99e0329c7854e0a83d022da6fe3  readline.sh
-3abdd4fb506d50cc5fabdc362dc61925  splashy_stop
 87a81331c2241707ab494584eb49a80b  unmask.sh
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index bde18236b..2bf92a15c 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,13 +5,13 @@
 
 name=aaabasicfs
 version=2011
-release=RC1
-scriptsversion=lfs-bootscripts-20100627
+release=RC2
+scriptsversion=lfs-bootscripts-20110424
 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\
+ fstab inittab inputrc network rc \
  profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \
 	http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-02.patch \
  nu readline.sh unmask.sh X.sh )
@@ -182,7 +182,6 @@ 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"
@@ -190,7 +189,6 @@ scripts=blfs-bootscripts
 EOF
 	echo "scriptsversion=$BLFSscriptsversion" >> $PKG/var/lib/pkg/blfs-bootscripts
 	ln -s /var/lib/pkg/blfs-bootscripts $PKG/etc/blfs-bootscripts
-	cp -v message $PKG/boot/
 	# Install Random Number Generation
 	cd $SRC/blfs-bootscripts-$BLFSscriptsversion
 	make DESTDIR=$PKG install-random
@@ -241,7 +239,7 @@ EOF
 			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}mountkernfs
+	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
diff --git a/base/aaabasicfs/message b/base/aaabasicfs/message
deleted file mode 100644
index d01af1603..000000000
--- a/base/aaabasicfs/message
+++ /dev/null
diff --git a/base/aaabasicfs/splashy_stop b/base/aaabasicfs/splashy_stop
deleted file mode 100755
index c6b366391..000000000
--- a/base/aaabasicfs/splashy_stop
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ -f /sbin/splashy_update ]; then
-	/sbin/splashy_update "exit"
-fi