Author: dj Date: 2011-05-22 21:41:56 -0600 (Sun, 22 May 2011) New Revision: 9550
Removed: trunk/BOOK/lsb-bootscripts/etc/inittab Modified: trunk/BOOK/lsb-bootscripts/ChangeLog trunk/BOOK/lsb-bootscripts/Makefile trunk/BOOK/lsb-bootscripts/etc/default/rc Log: Removed inittab, defaulted to /etc/rc.d. Modified: trunk/BOOK/lsb-bootscripts/ChangeLog =================================================================== --- trunk/BOOK/lsb-bootscripts/ChangeLog 2011-05-22 22:22:49 UTC (rev 9549) +++ trunk/BOOK/lsb-bootscripts/ChangeLog 2011-05-23 03:41:56 UTC (rev 9550) @@ -1,3 +1,10 @@ +2011-05-23 DJ Lucas <[email protected]> + * Makefile, etc/default/rc: The value of ETCDIR is used to set the RC_BASE at + install time. Changed default ETCDIR to /etc/rc.d and added /etc/init.d + symlink if ETCDIR is not /etc. + * Makefile, etc/inittab: Removed the installation of /etc/inittab as this is + done in the book. + 2011-05-21 DJ Lucas <[email protected]> * lib/lsb/init-functions: Merged the contents of etc/init.d/lfs-functions and standardized comment headers. Modified: trunk/BOOK/lsb-bootscripts/Makefile =================================================================== --- trunk/BOOK/lsb-bootscripts/Makefile 2011-05-22 22:22:49 UTC (rev 9549) +++ trunk/BOOK/lsb-bootscripts/Makefile 2011-05-23 03:41:56 UTC (rev 9550) @@ -1,4 +1,4 @@ -ETCDIR=/etc +ETCDIR=/etc/rc.d EXTDIR=${DESTDIR}${ETCDIR} MODE=754 DIRMODE=755 @@ -17,11 +17,12 @@ install -d -m ${DIRMODE} ${EXTDIR}/rc6.d install -d -m ${DIRMODE} ${EXTDIR}/rcS.d install -d -m ${DIRMODE} ${EXTDIR}/init.d - install -d -m ${DIRMODE} ${EXTDIR}/default - install -d -m ${DIRMODE} ${EXTDIR}/network + install -d -m ${DIRMODE} ${DESTDIR}/etc/default + install -d -m ${DIRMODE} ${DESTDIR}/etc/network install -d -m ${DIRMODE} ${DESTDIR}/sbin install -d -m ${DIRMODE} ${DESTDIR}/lib/lsb install -d -m ${DIRMODE} ${DESTDIR}/lib/network-services + if [ ${ETCDIR} != /etc ]; then ln -s ${DESTDIR}${ETCDIR}/init.d ${DESTDIR}/etc/init.d; fi install: create-dirs install -m ${MODE} etc/init.d/checkfs ${EXTDIR}/init.d/ @@ -44,12 +45,10 @@ install -m ${MODE} etc/init.d/udev ${EXTDIR}/init.d/ install -m ${MODE} etc/init.d/udev_retry ${EXTDIR}/init.d/ install -m ${CONFMODE} lib/lsb/init-functions ${DESTDIR}/lib/lsb/ - if [ ! -f ${EXTDIR}/default/createfiles ]; then install -m ${CONFMODE} etc/default/createfiles ${EXTDIR}/default/; fi - if [ ! -f ${EXTDIR}/default/modules ]; then install -m ${CONFMODE} etc/default/modules ${EXTDIR}/default/; fi - if [ ! -f ${EXTDIR}/default/rc ]; then install -m ${CONFMODE} etc/default/rc ${EXTDIR}/default/; fi - if [ ! -f ${EXTDIR}/default/rc.site ]; then install -m ${CONFMODE} etc/default/rc.site ${EXTDIR}/default/; fi - if [ -f ${EXTDIR}/inittab ]; then install -m ${CONFMODE} ${EXTDIR}/inittab ${EXTDIR}/inittab.bak; fi - install -m ${CONFMODE} etc/inittab ${EXTDIR}/ + if [ ! -f ${DESTDIR}/etc/default/createfiles ]; then install -m ${CONFMODE} etc/default/createfiles ${DESTDIR}/etc/default/; fi + if [ ! -f ${DESTDIR}/etc/default/modules ]; then install -m ${CONFMODE} etc/default/modules ${DESTDIR}/etc/default/; fi + if [ ! -f ${DESTDIR}/etc/default/rc ]; then install -m ${CONFMODE} etc/default/rc ${DESTDIR}/etc/default/; fi + if [ ! -f ${DESTDIR}/etc/default/rc.site ]; then install -m ${CONFMODE} etc/default/rc.site ${DESTDIR}/etc/default/; fi install -m ${MODE} sbin/ifup ${DESTDIR}/sbin/ install -m ${MODE} sbin/ifdown ${DESTDIR}/sbin/ install -m ${MODE} lib/network-services/ipv4-static ${DESTDIR}/lib/network-services/ @@ -70,6 +69,7 @@ /usr/lib/lsb/install_initd ${EXTDIR}/init.d/sysctl /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev_retry + sed 's@ETCDIR@${ETCDIR}@' -i ${DESTDIR}/etc/default/rc minimal: create-dirs install -m ${MODE} etc/init.d/checkfs ${EXTDIR}/init.d/ @@ -85,9 +85,7 @@ install -m ${MODE} etc/init.d/swap ${EXTDIR}/init.d/ install -m ${MODE} etc/init.d/udev ${EXTDIR}/init.d/ install -m ${CONFMODE} lib/lsb/init-functions ${DESTDIR}/lib/lsb/ - if [ ! -f ${EXTDIR}/default/rc ]; then install -m ${CONFMODE} default/rc ${EXTDIR}/default/; fi - if [ -f ${EXTDIR}/inittab ]; then install -m ${CONFMODE} ${EXTDIR}/inittab ${EXTDIR}/inittab.bak; fi - install -m ${CONFMODE} etc/inittab ${EXTDIR}/ + if [ ! -f ${DESTDIR}/etc/default/rc ]; then install -m ${CONFMODE} default/rc ${DESTDIR}/etc/default/; fi /usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs /usr/lib/lsb/install_initd ${EXTDIR}/init.d/cleanfs /usr/lib/lsb/install_initd ${EXTDIR}/init.d/halt Modified: trunk/BOOK/lsb-bootscripts/etc/default/rc =================================================================== --- trunk/BOOK/lsb-bootscripts/etc/default/rc 2011-05-22 22:22:49 UTC (rev 9549) +++ trunk/BOOK/lsb-bootscripts/etc/default/rc 2011-05-23 03:41:56 UTC (rev 9550) @@ -10,7 +10,7 @@ . /etc/default/rc.site # Set base directory information -RC_BASE="/etc" +RC_BASE="ETCDIR" # Location of network device scripts and config files NETWORK_DEVICES="/etc/network" Deleted: trunk/BOOK/lsb-bootscripts/etc/inittab =================================================================== --- trunk/BOOK/lsb-bootscripts/etc/inittab 2011-05-22 22:22:49 UTC (rev 9549) +++ trunk/BOOK/lsb-bootscripts/etc/inittab 2011-05-23 03:41:56 UTC (rev 9550) @@ -1,26 +0,0 @@ -# Begin /etc/inittab - -id:3:initdefault: - -si::sysinit:/etc/init.d/rc S - -l0:0:wait:/etc/init.d/rc 0 -l1:S1:wait:/etc/init.d/rc 1 -l2:2:wait:/etc/init.d/rc 2 -l3:3:wait:/etc/init.d/rc 3 -l4:4:wait:/etc/init.d/rc 4 -l5:5:wait:/etc/init.d/rc 5 -l6:6:wait:/etc/init.d/rc 6 - -ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now - -su:S016:once:/sbin/sulogin - -1:2345:respawn:/sbin/agetty tty1 9600 -2:2345:respawn:/sbin/agetty tty2 9600 -3:2345:respawn:/sbin/agetty tty3 9600 -4:2345:respawn:/sbin/agetty tty4 9600 -5:2345:respawn:/sbin/agetty tty5 9600 -6:2345:respawn:/sbin/agetty tty6 9600 - -# End /etc/inittab -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
