Rename /etc/sysconfig/init_params to /etc/sysconfig/rc.site.

Move network services to /lib/services.
Move init-functions to /lib/lsb.
Make /lib/lsb a symlink to /lib/services.
Create convenience symlink /etc/init.d->/etc/rc.d/init.d
Add help and man pages to ifup/ifdown.

Append /run/var/bootlog to /var/log/boot.log at the end of
the boot sequence.

Add capability to step through the boot scripts at boot time.

Optionally allow environment variables in sysconfig directory's
console, network, and clock files to be placed in rc.site.

Add an optional FASTBOOT parameter to set /fastboot when rebooting.

Remove a minor warning message from udev that is triggered
by the udev_retry boot script.

Add SKIPTMPCLEAN as an optional parameter to skip cleaning /tmp at boot time.

Add a page to Chapter 7 documenting rc.site. 



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9597 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 71 insertions, 80 deletions

diff --git a/bootscripts/Makefile b/bootscripts/Makefile
index 2dfde6ed3..f32217777 100644
--- a/bootscripts/Makefile
+++ b/bootscripts/Makefile
@@ -1,33 +1,37 @@
 ETCDIR=/etc
 EXTDIR=${DESTDIR}${ETCDIR}
-LIBDIR=${DESTDIR}/lib/boot
+LIBDIR=${DESTDIR}/lib/services
+MAN8=/usr/share/man/man8
 MODE=754
 DIRMODE=755
 CONFMODE=644
 
-all: install
+all: links
+
+install: all
 
 create-dirs:
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc0.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc1.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc2.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc3.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc4.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc5.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rc6.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/rcsysinit.d
-	install -d -m ${DIRMODE} ${EXTDIR}/rc.d/init.d
-	install -d -m ${DIRMODE} ${EXTDIR}/sysconfig
-	install -d -m ${DIRMODE} ${LIBDIR}
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc0.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc1.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc2.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc3.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc4.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc5.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rc6.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/rcS.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/rc.d/init.d
+	install -d -m ${DIRMODE}  ${EXTDIR}/sysconfig
+	install -d -m ${DIRMODE}  ${LIBDIR}
+	ln -svf       services    ${DESTDIR}/lib/lsb
+	ln -sf        rc.d/init.d ${EXTDIR}/init.d
 
-install: create-dirs 
+files: create-dirs 
 	install -m ${MODE} lfs/init.d/checkfs       ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/cleanfs       ${EXTDIR}/rc.d/init.d/
-	install -m ${CONFMODE} lfs/init.d/functions ${EXTDIR}/rc.d/init.d/
-	install -m ${CONFMODE} lfs/init.d/functions ${LIBDIR}
 	install -m ${MODE} lfs/init.d/halt          ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/console       ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/consolelog    ${EXTDIR}/rc.d/init.d/
+	install -m ${CONFMODE} lfs/init.d/functions ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/localnet      ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/modules       ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/mountfs       ${EXTDIR}/rc.d/init.d/
@@ -37,12 +41,49 @@ install: create-dirs
 	install -m ${MODE} lfs/init.d/reboot        ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/sysklogd      ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/swap          ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/sysctl        ${EXTDIR}/rc.d/init.d/
+	install -m ${MODE} lfs/init.d/sysklogd      ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/template      ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
 	install -m ${MODE} lfs/init.d/udev_retry    ${EXTDIR}/rc.d/init.d/
+	install -m ${MODE} lfs/sbin/ifup            /sbin
+	install -m ${MODE} lfs/sbin/ifdown          /sbin
+	install -m ${MODE} lfs/sbin/ifup.8          ${MAN8}
+	ln -sf ifup.8                               ${MAN8}/ifdown.8
+	install -m ${MODE} lfs/lib/services/ipv4-static-route  ${LIBDIR}
+	install -m ${MODE} lfs/lib/services/ipv4-static        ${LIBDIR}
+	install -m ${CONFMODE} lfs/lib/services/init-functions ${LIBDIR}
+	if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then \
+     install -m ${CONFMODE} lfs/sysconfig/createfiles ${EXTDIR}/sysconfig/ ;\
+   fi
+	if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then \
+     install -m ${CONFMODE} lfs/sysconfig/modules     ${EXTDIR}/sysconfig/ ;\
+   fi
+	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then \
+     install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/ ;\
+   fi
+	if [ ! -f ${EXTDIR}/sysconfig/rc.site     ]; then \
+     install -m ${CONFMODE} lfs/sysconfig/rc.site     ${EXTDIR}/sysconfig/ ;\
+   fi
+
+links: files rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6
+
+rcS:
+	ln -sf ../init.d/mountvirtfs ${EXTDIR}/rc.d/rcS.d/S00mountvirtfs
+	ln -sf ../init.d/consolelog  ${EXTDIR}/rc.d/rcS.d/S02consolelog
+	ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcS.d/S05modules
+	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcS.d/S08localnet
+	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcS.d/S10udev
+	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcS.d/S20swap
+	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcS.d/S30checkfs
+	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcS.d/S40mountfs
+	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcS.d/S45cleanfs
+	ln -sf ../init.d/udev_retry  ${EXTDIR}/rc.d/rcS.d/S50udev_retry
+	ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcS.d/S70console
+	ln -sf ../init.d/sysctl      ${EXTDIR}/rc.d/rcS.d/S90sysctl
+
+rc0:
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc0.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc0.d/K90sysklogd
 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
@@ -50,16 +91,28 @@ install: create-dirs
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc0.d/S80swap
 	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc0.d/S90localnet
 	ln -sf ../init.d/halt        ${EXTDIR}/rc.d/rc0.d/S99halt
+
+rc1:
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc1.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc1.d/K90sysklogd
+
+rc2:
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc2.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc2.d/K90sysklogd
+
+rc3:
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc3.d/S10sysklogd
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc3.d/S20network
+
+rc4:
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc4.d/S10sysklogd
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc4.d/S20network
+
+rc5:
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc5.d/S10sysklogd
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc5.d/S20network
+
+rc6:
 	ln -sf ../init.d/network     ${EXTDIR}/rc.d/rc6.d/K80network
 	ln -sf ../init.d/sysklogd    ${EXTDIR}/rc.d/rc6.d/K90sysklogd
 	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
@@ -67,68 +120,6 @@ install: create-dirs
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc6.d/S80swap
 	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rc6.d/S90localnet
 	ln -sf ../init.d/reboot      ${EXTDIR}/rc.d/rc6.d/S99reboot
-	ln -sf ../init.d/mountvirtfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountvirtfs
-	ln -sf ../init.d/consolelog  ${EXTDIR}/rc.d/rcsysinit.d/S02consolelog
-	ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcsysinit.d/S05modules
-	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
-	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
-	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
-	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
-	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
-	ln -sf ../init.d/udev_retry  ${EXTDIR}/rc.d/rcsysinit.d/S50udev_retry
-	ln -sf ../init.d/console     ${EXTDIR}/rc.d/rcsysinit.d/S70console
-	ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcsysinit.d/S80localnet
-	ln -sf ../init.d/sysctl      ${EXTDIR}/rc.d/rcsysinit.d/S90sysctl
-	if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/createfiles ${EXTDIR}/sysconfig/ ;\
-   fi
-	if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/modules     ${EXTDIR}/sysconfig/ ;\
-   fi
-	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then \
-     install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/ ;\
-   fi
-	install -m ${MODE} lfs/sysconfig/network-devices/ifup   /sbin
-	install -m ${MODE} lfs/sysconfig/network-devices/ifdown /sbin
-	install -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static       ${LIBDIR}
-	install -m ${MODE} lfs/sysconfig/network-devices/services/ipv4-static-route ${LIBDIR}
-
-install-consolelog: create-dirs
-	install -m ${MODE} contrib/init.d/consolelog   ${EXTDIR}/rc.d/init.d
-	ln -sf ../init.d/consolelog  ${EXTDIR}/rc.d/rcsysinit.d/S00consolelog
-
-minimal: create-dirs 
-	install -m ${MODE} lfs/init.d/checkfs       ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/cleanfs       ${EXTDIR}/rc.d/init.d/
-	install -m ${CONFMODE} lfs/init.d/functions ${EXTDIR}/rc.d/init.d/
-	install -m ${CONFMODE} lfs/init.d/functions ${LIBDIR}
-	install -m ${MODE} lfs/init.d/halt          ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/localnet      ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/mountfs       ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/mountvirtfs   ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/rc            ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/reboot        ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/sendsignals   ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/setclock      ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/swap          ${EXTDIR}/rc.d/init.d/
-	install -m ${MODE} lfs/init.d/udev          ${EXTDIR}/rc.d/init.d/
-	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
-	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc0.d/S70mountfs
-	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc0.d/S80swap
-	ln -sf ../init.d/halt        ${EXTDIR}/rc.d/rc0.d/S99halt
-	ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
-	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rc6.d/S70mountfs
-	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rc6.d/S80swap
-	ln -sf ../init.d/reboot      ${EXTDIR}/rc.d/rc6.d/S99reboot
-	ln -sf ../init.d/mountvirtfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountvirtfs
-	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
-	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
-	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
-	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
-	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
-	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then \
-      install -m ${CONFMODE} lfs/sysconfig/rc ${EXTDIR}/sysconfig/; \
-   fi
 
-.PHONY: all create-dirs install 
+.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6