From 6d0feae5efcfbd35f5de7b43d5af0b3d8cdda8be Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 4 Nov 2010 13:26:24 +0100
Subject: aaabasicfs, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/aaabasicfs/Pkgfile                  |  3 +-
 base/aaabasicfs/lfs-bootscripts-02.patch | 68 --------------------------------
 2 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 base/aaabasicfs/lfs-bootscripts-02.patch

(limited to 'base')

diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index b0f8f317f..058ae9c97 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -11,7 +11,8 @@ BLFSscriptsversion=20100825
 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 splashy_stop\
- profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-02.patch \
+ 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 )
 
 
diff --git a/base/aaabasicfs/lfs-bootscripts-02.patch b/base/aaabasicfs/lfs-bootscripts-02.patch
deleted file mode 100644
index 56ee98ec8..000000000
--- a/base/aaabasicfs/lfs-bootscripts-02.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- lfs-bootscripts-20090817/lfs/init.d/checkfs.orig	2009-10-02 21:54:45.000000000 +0000
-+++ lfs-bootscripts-20090817/lfs/init.d/checkfs	2009-10-02 21:56:21.000000000 +0000
-@@ -58,15 +58,15 @@
- 			boot_mesg -n "/forcefsck found, forcing file" ${INFO}
- 			boot_mesg " system checks as requested."
- 			echo_ok
--			options="-f"
-+			options="-A -C -T"
- 		else
--			options=""
-+			options="-a -A -C -T"
- 		fi
- 
- 		boot_mesg "Checking file systems..."
- 		# Note: -a option used to be -p; but this fails e.g.
- 		# on fsck.minix
--		fsck ${options} -a -A -C -T
-+		fsck ${options}
- 		error_value=${?}
- 
- 		if [ "${error_value}" = 0 ]; then
---- lfs-bootscripts-20090817/lfs/init.d/cleanfs.orig	2009-10-04 07:55:51.000000000 +0000
-+++ lfs-bootscripts-20090817/lfs/init.d/cleanfs	2009-10-04 08:03:50.000000000 +0000
-@@ -74,6 +74,7 @@
- 		boot_mesg -n "Cleaning file systems:" ${INFO}
- 
- 		boot_mesg -n " /tmp" ${NORMAL}
-+		chmod 1777 /tmp
- 		cd /tmp &&
- 		find . -xdev -mindepth 1 ! -name lost+found \
- 			-delete || failed=1
---- lfs-bootscripts-20090817/lfs/init.d/sysklogd.orig	2009-10-04 08:06:12.000000000 +0000
-+++ lfs-bootscripts-20090817/lfs/init.d/sysklogd	2009-10-04 08:07:04.000000000 +0000
-@@ -30,6 +30,10 @@
- 
- 		boot_mesg "Stopping system log daemon..."
- 		killproc syslogd
-+		mv /var/log/sys.log /var/log/sys.log.old
-+		touch /var/log/sys.log
-+		mv /var/log/wtmp /var/log/wtmp.old
-+		touch /var/log/wtmp
- 		;;
- 
- 	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
-- 
cgit v1.2.3-70-g09d2