[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1029-g0e9dcd5
git
git at cross-lfs.org
Fri May 16 20:49:26 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via 0e9dcd5f935431216bfaf7e0db4ea9c90ee02e82 (commit)
via 74e049fcb42eb1c80ce4ae5dd8b13d9b60fc289b (commit)
via 21f4832af989c88bd278a2e8414af5fa7b24f28d (commit)
via 30d12564f9187844476072bc5b52a0ee8249cfe7 (commit)
via b0b1e1d246b7383f7d0e6ba399086ce24440c4af (commit)
via f2473a9eee72599772c09923a14c71bfa387e74f (commit)
from 851331b9e50f0d5e8a7d885011aa130ffa58e3c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0e9dcd5f935431216bfaf7e0db4ea9c90ee02e82
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Fri May 16 17:49:12 2014 -0500
Use the proper entity for the patch from patches.ent.
diff --git a/patches/sysvinit-2.88dsf-tools_updates-1.patch b/patches/sysvinit-2.88dsf-tools_updates-1.patch
index 83ad148..e5dff24 100644
--- a/patches/sysvinit-2.88dsf-tools_updates-1.patch
+++ b/patches/sysvinit-2.88dsf-tools_updates-1.patch
@@ -1,3 +1,10 @@
+Submitted By: William Harrington (kb0iic at cross-lfs dot org)
+Date: 2014-05-16
+Initial Package Version: 2.88dsf
+Origin: Idea for cleaning up boot chapter by Chris Staub
+Upstream Status: Not Applied - CLFS Specific
+Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible.
+
diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
--- sysvinit-2.88dsf.orig/src/Makefile 2010-04-11 05:30:27.000000000 -0400
+++ sysvinit-2.88dsf/src/Makefile 2014-04-14 17:00:32.000000000 -0400
commit 74e049fcb42eb1c80ce4ae5dd8b13d9b60fc289b
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Fri May 16 17:48:44 2014 -0500
Remove bootscripts updates 2.1 pre1 patch.
diff --git a/patches/bootscripts-cross-lfs-2.1-pre1-updates-1.patch b/patches/bootscripts-cross-lfs-2.1-pre1-updates-1.patch
deleted file mode 100644
index a0034f8..0000000
--- a/patches/bootscripts-cross-lfs-2.1-pre1-updates-1.patch
+++ /dev/null
@@ -1,449 +0,0 @@
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/Makefile bootscripts-cross-lfs-2.1-pre1/Makefile
---- bootscripts-cross-lfs-2.1-pre1.orig/Makefile 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/Makefile 2014-04-13 15:52:56.000000000 -0400
-@@ -118,7 +118,6 @@
- if [ ! -f ${EXTDIR}/sysconfig/i18n ]; then install -m ${CONFMODE} clfs/sysconfig/i18n ${EXTDIR}/sysconfig/; fi
- if [ ! -f ${EXTDIR}/sysconfig/modules ]; then install -m ${CONFMODE} clfs/sysconfig/modules ${EXTDIR}/sysconfig/; fi
- if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
-- @$(MAKE) mknod_devices
-
- install-network: create-dirs create-service-dir
-
-@@ -138,7 +137,7 @@
- install-service-mtu: create-service-dir
- install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
-
--install-minimal: create-dirs create-service-dir udev_device_dirs udev_device_links
-+install-minimal: create-dirs create-service-dir
- sed -e 's|/bin:/usr/bin:/sbin:/usr/sbin|/tools/bin:/tools/sbin:/bin:/sbin|g' clfs/init.d/functions > clfs/init.d/functions.minimal
- install -m ${MODE} clfs/init.d/checkfs ${EXTDIR}/rc.d/init.d/
- install -m ${MODE} clfs/init.d/cleanfs ${EXTDIR}/rc.d/init.d/
-@@ -170,7 +169,6 @@
- ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
- if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
- if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} clfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
-- @$(MAKE) mknod_devices
-
- install-raq2: create-dirs
- install -m ${MODE} clfs/init.d/paneld ${EXTDIR}/rc.d/init.d/
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs 2014-04-13 15:53:20.000000000 -0400
-@@ -25,7 +25,7 @@
- #
- #########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs 2014-04-13 15:53:20.000000000 -0400
-@@ -12,13 +12,13 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- # Function to create files/directory on boot.
- create_files() {
- # Read in the configuration file.
-- exec 9>&0 < /etc/sysconfig/createfiles
-+ exec 9>&0 < /tools/etc/sysconfig/createfiles
- while read name type perm usr grp dtype maj min junk
- do
-
-@@ -87,8 +87,8 @@
- (exit ${failed})
- evaluate_retval
- boot_mesg "" ${NORMAL}
-- if [ -e /etc/sysconfig/createfiles ]; then
-- if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
-+ if [ -e /tools/etc/sysconfig/createfiles ]; then
-+ if egrep -qv '^(#|$)' /tools/etc/sysconfig/createfiles 2>/dev/null; then
- boot_mesg "Creating files and directories..."
- create_files
- evaluate_retval
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog 2014-04-13 15:53:20.000000000 -0400
-@@ -13,13 +13,13 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- # set the default loglevel
- LOGLEVEL=7
--if [ -r /etc/sysconfig/console ]; then
-- . /etc/sysconfig/console
-+if [ -r /tools/etc/sysconfig/console ]; then
-+ . /tools/etc/sysconfig/console
- fi
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions 2014-04-13 15:53:20.000000000 -0400
-@@ -13,14 +13,14 @@
- #
- ########################################################################
-
--if [ -e /etc/sysconfig/lcd ]; then
-+if [ -e /tools/etc/sysconfig/lcd ]; then
- if [ -e /dev/lcd ]; then
-- source /etc/sysconfig/lcd
-+ source /tools/etc/sysconfig/lcd
- fi
- fi
-
--if [ -e /etc/sysconfig/bootscripts ]; then
-- source /etc/sysconfig/bootscripts
-+if [ -e /tools/etc/sysconfig/bootscripts ]; then
-+ source /tools/etc/sysconfig/bootscripts
- fi
-
- ## Environmental setup
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal 2014-04-13 15:53:20.000000000 -0400
-@@ -13,14 +13,14 @@
- #
- ########################################################################
-
--if [ -e /etc/sysconfig/lcd ]; then
-+if [ -e /tools/etc/sysconfig/lcd ]; then
- if [ -e /dev/lcd ]; then
-- source /etc/sysconfig/lcd
-+ source /tools/etc/sysconfig/lcd
- fi
- fi
-
--if [ -e /etc/sysconfig/bootscripts ]; then
-- source /etc/sysconfig/bootscripts
-+if [ -e /tools/etc/sysconfig/bootscripts ]; then
-+ source /tools/etc/sysconfig/bootscripts
- fi
-
- ## Environmental setup
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n 2014-04-13 15:53:20.000000000 -0400
-@@ -12,11 +12,11 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
--if [ -f /etc/sysconfig/i18n ]; then
-- . /etc/sysconfig/i18n
-+if [ -f /tools/etc/sysconfig/i18n ]; then
-+ . /tools/etc/sysconfig/i18n
- fi
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet 2014-04-13 15:53:20.000000000 -0400
-@@ -12,9 +12,9 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
--. /etc/sysconfig/network
-+. /tools/etc/sysconfig/network
-
- case "${1}" in
- start)
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- # Assure that the kernel has module support.
-@@ -23,8 +23,8 @@
-
- # Exit if there's no modules file or there are no
- # valid entries
-- [ -r /etc/sysconfig/modules ] &&
-- egrep -qv '^($|#)' /etc/sysconfig/modules ||
-+ [ -r /tools/etc/sysconfig/modules ] &&
-+ egrep -qv '^($|#)' /tools/etc/sysconfig/modules ||
- exit 0
-
- boot_mesg -n "Loading modules:" ${INFO}
-@@ -49,7 +49,7 @@
- else
- failedmod="${failedmod} ${module}"
- fi
-- done < /etc/sysconfig/modules
-+ done < /tools/etc/sysconfig/modules
-
- boot_mesg "" ${NORMAL}
- # Print a message about successfully loaded
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network 2014-04-13 15:53:20.000000000 -0400
-@@ -14,9 +14,9 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
--. /etc/sysconfig/network
-+. /tools/etc/sysconfig/network
-
- case "${1}" in
- start)
-@@ -70,4 +70,4 @@
- ;;
- esac
-
--# End /etc/rc.d/init.d/network
-+# End /tools/etc/rc.d/init.d/network
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . $rc_functions
-
- case "$1" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- # This sets a few default terminal options.
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock 2014-04-13 15:53:20.000000000 -0400
-@@ -12,9 +12,9 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
--. /etc/sysconfig/clock
-+. /tools/etc/sysconfig/clock
-
- CLOCKPARAMS=
-
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . $rc_functions
-
- case "$1" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl 2014-04-13 15:53:20.000000000 -0400
-@@ -14,7 +14,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template 2014-04-13 15:53:20.000000000 -0400
-@@ -12,7 +12,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "${1}" in
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev 2014-04-13 15:53:20.000000000 -0400
-@@ -16,7 +16,7 @@
- #
- ########################################################################
-
--. /etc/sysconfig/rc
-+. /tools/etc/sysconfig/rc
- . ${rc_functions}
-
- case "$1" in
-@@ -25,7 +25,7 @@
-
- # start udevd
- boot_mesg "\nStarting udevd..."
-- /sbin/udevd --daemon
-+ /tools/sbin/udevd --daemon
- evaluate_retval
-
- # start coldplugging
-@@ -35,29 +35,29 @@
- #mkdir -p /run/.udev/queue
-
- # configure all devices
-- /sbin/udevadm trigger --action=add --type=subsystems
-- /sbin/udevadm trigger --action=add --type=devices
-+ /tools/sbin/udevadm trigger --action=add --type=subsystems
-+ /tools/sbin/udevadm trigger --action=add --type=devices
-
- # this replaces the old loop, exits after all devices are done
-- /sbin/udevadm settle
-+ /tools/sbin/udevadm settle
-
- echo_ok
- ;;
-
- stop)
- boot_mesg "Stopping udevd..."
-- killproc /sbin/udevd
-+ killproc /tools/sbin/udevd
- ;;
-
- restart)
- boot_mesg "Restarting udevd..."
-- killproc /sbin/udevd
-- loadproc /sbin/udevd --daemon
-+ killproc /tools/sbin/udevd
-+ loadproc /tools/sbin/udevd --daemon
- evaluate_retval
- ;;
-
- status)
-- statusproc /sbin/udevd
-+ statusproc /tools/sbin/udevd
- ;;
-
- *)
-diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc
---- bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc 2014-04-12 13:37:45.000000000 -0400
-+++ bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc 2014-04-14 00:33:44.000000000 -0400
-@@ -11,7 +11,7 @@
- #
- ########################################################################
-
--rc_base=/etc/rc.d
-+rc_base=/tools/etc/rc.d
- rc_functions=${rc_base}/init.d/functions
- network_devices=/etc/sysconfig/network-devices
-
commit 21f4832af989c88bd278a2e8414af5fa7b24f28d
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Fri May 16 17:48:12 2014 -0500
Rename booscripts tools updates patch and add a patch header.
diff --git a/patches/bootscripts-cross-lfs-3.0-pre1-tools_updates-1.patch b/patches/bootscripts-cross-lfs-3.0-pre1-tools_updates-1.patch
new file mode 100644
index 0000000..dfc2a6d
--- /dev/null
+++ b/patches/bootscripts-cross-lfs-3.0-pre1-tools_updates-1.patch
@@ -0,0 +1,456 @@
+Submitted By: William Harrington (kb0iic at cross-lfs dot org)
+Date: 2014-05-16
+Initial Package Version: 3.1-pre1
+Origin: Idea for cleaning up boot chapter by Chris Staub
+Upstream Status: Not Applied - CLFS Specific
+Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible.
+
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/Makefile bootscripts-cross-lfs-2.1-pre1/Makefile
+--- bootscripts-cross-lfs-2.1-pre1.orig/Makefile 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/Makefile 2014-04-13 15:52:56.000000000 -0400
+@@ -118,7 +118,6 @@
+ if [ ! -f ${EXTDIR}/sysconfig/i18n ]; then install -m ${CONFMODE} clfs/sysconfig/i18n ${EXTDIR}/sysconfig/; fi
+ if [ ! -f ${EXTDIR}/sysconfig/modules ]; then install -m ${CONFMODE} clfs/sysconfig/modules ${EXTDIR}/sysconfig/; fi
+ if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
+- @$(MAKE) mknod_devices
+
+ install-network: create-dirs create-service-dir
+
+@@ -138,7 +137,7 @@
+ install-service-mtu: create-service-dir
+ install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
+
+-install-minimal: create-dirs create-service-dir udev_device_dirs udev_device_links
++install-minimal: create-dirs create-service-dir
+ sed -e 's|/bin:/usr/bin:/sbin:/usr/sbin|/tools/bin:/tools/sbin:/bin:/sbin|g' clfs/init.d/functions > clfs/init.d/functions.minimal
+ install -m ${MODE} clfs/init.d/checkfs ${EXTDIR}/rc.d/init.d/
+ install -m ${MODE} clfs/init.d/cleanfs ${EXTDIR}/rc.d/init.d/
+@@ -170,7 +169,6 @@
+ ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
+ if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
+ if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} clfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
+- @$(MAKE) mknod_devices
+
+ install-raq2: create-dirs
+ install -m ${MODE} clfs/init.d/paneld ${EXTDIR}/rc.d/init.d/
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs 2014-04-13 15:53:20.000000000 -0400
+@@ -25,7 +25,7 @@
+ #
+ #########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs 2014-04-13 15:53:20.000000000 -0400
+@@ -12,13 +12,13 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ # Function to create files/directory on boot.
+ create_files() {
+ # Read in the configuration file.
+- exec 9>&0 < /etc/sysconfig/createfiles
++ exec 9>&0 < /tools/etc/sysconfig/createfiles
+ while read name type perm usr grp dtype maj min junk
+ do
+
+@@ -87,8 +87,8 @@
+ (exit ${failed})
+ evaluate_retval
+ boot_mesg "" ${NORMAL}
+- if [ -e /etc/sysconfig/createfiles ]; then
+- if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
++ if [ -e /tools/etc/sysconfig/createfiles ]; then
++ if egrep -qv '^(#|$)' /tools/etc/sysconfig/createfiles 2>/dev/null; then
+ boot_mesg "Creating files and directories..."
+ create_files
+ evaluate_retval
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog 2014-04-13 15:53:20.000000000 -0400
+@@ -13,13 +13,13 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ # set the default loglevel
+ LOGLEVEL=7
+-if [ -r /etc/sysconfig/console ]; then
+- . /etc/sysconfig/console
++if [ -r /tools/etc/sysconfig/console ]; then
++ . /tools/etc/sysconfig/console
+ fi
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions 2014-04-13 15:53:20.000000000 -0400
+@@ -13,14 +13,14 @@
+ #
+ ########################################################################
+
+-if [ -e /etc/sysconfig/lcd ]; then
++if [ -e /tools/etc/sysconfig/lcd ]; then
+ if [ -e /dev/lcd ]; then
+- source /etc/sysconfig/lcd
++ source /tools/etc/sysconfig/lcd
+ fi
+ fi
+
+-if [ -e /etc/sysconfig/bootscripts ]; then
+- source /etc/sysconfig/bootscripts
++if [ -e /tools/etc/sysconfig/bootscripts ]; then
++ source /tools/etc/sysconfig/bootscripts
+ fi
+
+ ## Environmental setup
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal 2014-04-13 15:53:20.000000000 -0400
+@@ -13,14 +13,14 @@
+ #
+ ########################################################################
+
+-if [ -e /etc/sysconfig/lcd ]; then
++if [ -e /tools/etc/sysconfig/lcd ]; then
+ if [ -e /dev/lcd ]; then
+- source /etc/sysconfig/lcd
++ source /tools/etc/sysconfig/lcd
+ fi
+ fi
+
+-if [ -e /etc/sysconfig/bootscripts ]; then
+- source /etc/sysconfig/bootscripts
++if [ -e /tools/etc/sysconfig/bootscripts ]; then
++ source /tools/etc/sysconfig/bootscripts
+ fi
+
+ ## Environmental setup
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n 2014-04-13 15:53:20.000000000 -0400
+@@ -12,11 +12,11 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+-if [ -f /etc/sysconfig/i18n ]; then
+- . /etc/sysconfig/i18n
++if [ -f /tools/etc/sysconfig/i18n ]; then
++ . /tools/etc/sysconfig/i18n
+ fi
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet 2014-04-13 15:53:20.000000000 -0400
+@@ -12,9 +12,9 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+-. /etc/sysconfig/network
++. /tools/etc/sysconfig/network
+
+ case "${1}" in
+ start)
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ # Assure that the kernel has module support.
+@@ -23,8 +23,8 @@
+
+ # Exit if there's no modules file or there are no
+ # valid entries
+- [ -r /etc/sysconfig/modules ] &&
+- egrep -qv '^($|#)' /etc/sysconfig/modules ||
++ [ -r /tools/etc/sysconfig/modules ] &&
++ egrep -qv '^($|#)' /tools/etc/sysconfig/modules ||
+ exit 0
+
+ boot_mesg -n "Loading modules:" ${INFO}
+@@ -49,7 +49,7 @@
+ else
+ failedmod="${failedmod} ${module}"
+ fi
+- done < /etc/sysconfig/modules
++ done < /tools/etc/sysconfig/modules
+
+ boot_mesg "" ${NORMAL}
+ # Print a message about successfully loaded
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network 2014-04-13 15:53:20.000000000 -0400
+@@ -14,9 +14,9 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+-. /etc/sysconfig/network
++. /tools/etc/sysconfig/network
+
+ case "${1}" in
+ start)
+@@ -70,4 +70,4 @@
+ ;;
+ esac
+
+-# End /etc/rc.d/init.d/network
++# End /tools/etc/rc.d/init.d/network
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . $rc_functions
+
+ case "$1" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ # This sets a few default terminal options.
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock 2014-04-13 15:53:20.000000000 -0400
+@@ -12,9 +12,9 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+-. /etc/sysconfig/clock
++. /tools/etc/sysconfig/clock
+
+ CLOCKPARAMS=
+
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . $rc_functions
+
+ case "$1" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl 2014-04-13 15:53:20.000000000 -0400
+@@ -14,7 +14,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template 2014-04-13 15:53:20.000000000 -0400
+@@ -12,7 +12,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "${1}" in
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev 2014-04-13 15:53:20.000000000 -0400
+@@ -16,7 +16,7 @@
+ #
+ ########################################################################
+
+-. /etc/sysconfig/rc
++. /tools/etc/sysconfig/rc
+ . ${rc_functions}
+
+ case "$1" in
+@@ -25,7 +25,7 @@
+
+ # start udevd
+ boot_mesg "\nStarting udevd..."
+- /sbin/udevd --daemon
++ /tools/sbin/udevd --daemon
+ evaluate_retval
+
+ # start coldplugging
+@@ -35,29 +35,29 @@
+ #mkdir -p /run/.udev/queue
+
+ # configure all devices
+- /sbin/udevadm trigger --action=add --type=subsystems
+- /sbin/udevadm trigger --action=add --type=devices
++ /tools/sbin/udevadm trigger --action=add --type=subsystems
++ /tools/sbin/udevadm trigger --action=add --type=devices
+
+ # this replaces the old loop, exits after all devices are done
+- /sbin/udevadm settle
++ /tools/sbin/udevadm settle
+
+ echo_ok
+ ;;
+
+ stop)
+ boot_mesg "Stopping udevd..."
+- killproc /sbin/udevd
++ killproc /tools/sbin/udevd
+ ;;
+
+ restart)
+ boot_mesg "Restarting udevd..."
+- killproc /sbin/udevd
+- loadproc /sbin/udevd --daemon
++ killproc /tools/sbin/udevd
++ loadproc /tools/sbin/udevd --daemon
+ evaluate_retval
+ ;;
+
+ status)
+- statusproc /sbin/udevd
++ statusproc /tools/sbin/udevd
+ ;;
+
+ *)
+diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc
+--- bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc 2014-04-12 13:37:45.000000000 -0400
++++ bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc 2014-04-14 00:33:44.000000000 -0400
+@@ -11,7 +11,7 @@
+ #
+ ########################################################################
+
+-rc_base=/etc/rc.d
++rc_base=/tools/etc/rc.d
+ rc_functions=${rc_base}/init.d/functions
+ network_devices=/etc/sysconfig/network-devices
+
commit 30d12564f9187844476072bc5b52a0ee8249cfe7
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Fri May 16 17:47:37 2014 -0500
Add booscripts tools updates patch to patches.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 1f3e605..3ff5399 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -14,6 +14,10 @@
<!ENTITY binutils-branch_update-patch-size "5,268 KB">
-->
+<!ENTITY bootscripts-clfs-tools_updates-patch "bootscripts-cross-lfs-&bootscripts-clfs-version;-tools_updates-1.patch">
+<!ENTITY bootscripts-clfs-tools_updates-patch-md5 "bf6961c3de593653509156497707e8c6">
+<!ENTITY bootscripts-clfs-tools_updates-patch-size "17.331 KB">
+
<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
<!ENTITY coreutils-uname-patch-md5 "6eeba217c88ec83b807e305e594fe13d">
<!ENTITY coreutils-uname-patch-size "4.9 KB">
commit b0b1e1d246b7383f7d0e6ba399086ce24440c4af
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Fri May 16 17:47:01 2014 -0500
Add the bootscripts tools updates patch to materials.
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index ef99512..02211f1 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -38,6 +38,15 @@
</varlistentry>
-->
<varlistentry>
+ <term>Bootscripts Cross-LFS Updates Patch - <token>&bootscripts-clfs-tools_updates-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&bootscripts-clfs-tools_updates-patch;"/></para>
+ <para>MD5 sum: <literal>&bootscripts-clfs-tools_updates-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
commit f2473a9eee72599772c09923a14c71bfa387e74f
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Fri May 16 17:46:42 2014 -0500
Add command for applying the tools update patch for the bootscripts.
diff --git a/BOOK/boot/common/bootscripts.xml b/BOOK/boot/common/bootscripts.xml
index 07b1f10..421c2d0 100644
--- a/BOOK/boot/common/bootscripts.xml
+++ b/BOOK/boot/common/bootscripts.xml
@@ -25,6 +25,11 @@
<sect2 role="installation">
<title>Installation of Bootscripts</title>
+ <para os="p1">Apply a patch which modifies the scripts for use in
+ <filename class="directory">/tools</filename>:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&bootscripts-clfs-tools_updates-patch;</userinput></screen>
+
<para os="a">Install the package:</para>
<screen os="b"><userinput>make DESTDIR=/tools install-bootscripts</userinput></screen>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/common/bootscripts.xml | 5 +++++
BOOK/materials/common/patches.xml | 9 +++++++++
BOOK/patches.ent | 4 ++++
...ripts-cross-lfs-3.0-pre1-tools_updates-1.patch} | 7 +++++++
patches/sysvinit-2.88dsf-tools_updates-1.patch | 7 +++++++
5 files changed, 32 insertions(+), 0 deletions(-)
rename patches/{bootscripts-cross-lfs-2.1-pre1-updates-1.patch => bootscripts-cross-lfs-3.0-pre1-tools_updates-1.patch} (98%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list