Changeset 5393dbc for lsb-bootscripts


Ignore:
Timestamp:
05/23/2011 03:41:56 AM (13 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
90b4574
Parents:
283fea13
Message:

Removed inittab, defaulted to /etc/rc.d.

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

Location:
lsb-bootscripts
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • lsb-bootscripts/ChangeLog

    r283fea13 r5393dbc  
     12011-05-23      DJ Lucas <dj@linuxfromscratch.org>
     2  * Makefile, etc/default/rc: The value of ETCDIR is used to set the RC_BASE at
     3    install time. Changed default ETCDIR to /etc/rc.d and added /etc/init.d
     4    symlink if ETCDIR is not /etc.
     5  * Makefile, etc/inittab: Removed the installation of /etc/inittab as this is
     6    done in the book.
     7
    182011-05-21      DJ Lucas <dj@linuxfromscratch.org>
    29  * lib/lsb/init-functions: Merged the contents of etc/init.d/lfs-functions and

  • lsb-bootscripts/Makefile

    r283fea13 r5393dbc  
    1 ETCDIR=/etc
     1ETCDIR=/etc/rc.d
    22EXTDIR=${DESTDIR}${ETCDIR}
    33MODE=754
    … …  
    1818        install -d -m ${DIRMODE} ${EXTDIR}/rcS.d
    1919        install -d -m ${DIRMODE} ${EXTDIR}/init.d
    20         install -d -m ${DIRMODE} ${EXTDIR}/default
    21         install -d -m ${DIRMODE} ${EXTDIR}/network
     20        install -d -m ${DIRMODE} ${DESTDIR}/etc/default
     21        install -d -m ${DIRMODE} ${DESTDIR}/etc/network
    2222        install -d -m ${DIRMODE} ${DESTDIR}/sbin
    2323        install -d -m ${DIRMODE} ${DESTDIR}/lib/lsb
    2424        install -d -m ${DIRMODE} ${DESTDIR}/lib/network-services
     25        if [ ${ETCDIR} != /etc ]; then ln -s ${DESTDIR}${ETCDIR}/init.d ${DESTDIR}/etc/init.d; fi
    2526
    2627install: create-dirs
    … …  
    4546        install -m ${MODE} etc/init.d/udev_retry            ${EXTDIR}/init.d/
    4647        install -m ${CONFMODE} lib/lsb/init-functions       ${DESTDIR}/lib/lsb/
    47         if [ ! -f ${EXTDIR}/default/createfiles ]; then install -m ${CONFMODE} etc/default/createfiles ${EXTDIR}/default/; fi
    48         if [ ! -f ${EXTDIR}/default/modules     ]; then install -m ${CONFMODE} etc/default/modules     ${EXTDIR}/default/; fi
    49         if [ ! -f ${EXTDIR}/default/rc          ]; then install -m ${CONFMODE} etc/default/rc          ${EXTDIR}/default/; fi
    50         if [ ! -f ${EXTDIR}/default/rc.site     ]; then install -m ${CONFMODE} etc/default/rc.site     ${EXTDIR}/default/; fi
    51         if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
    52         install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
     48        if [ ! -f ${DESTDIR}/etc/default/createfiles ]; then install -m ${CONFMODE} etc/default/createfiles ${DESTDIR}/etc/default/; fi
     49        if [ ! -f ${DESTDIR}/etc/default/modules     ]; then install -m ${CONFMODE} etc/default/modules     ${DESTDIR}/etc/default/; fi
     50        if [ ! -f ${DESTDIR}/etc/default/rc          ]; then install -m ${CONFMODE} etc/default/rc          ${DESTDIR}/etc/default/; fi
     51        if [ ! -f ${DESTDIR}/etc/default/rc.site     ]; then install -m ${CONFMODE} etc/default/rc.site     ${DESTDIR}/etc/default/; fi
    5352        install                   -m ${MODE} sbin/ifup   ${DESTDIR}/sbin/
    5453        install                   -m ${MODE} sbin/ifdown ${DESTDIR}/sbin/
    … …  
    7170        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
    7271        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev_retry
     72        sed 's@ETCDIR@${ETCDIR}@' -i ${DESTDIR}/etc/default/rc
    7373
    7474minimal: create-dirs
    … …  
    8686        install -m ${MODE} etc/init.d/udev              ${EXTDIR}/init.d/
    8787        install -m ${CONFMODE} lib/lsb/init-functions   ${DESTDIR}/lib/lsb/
    88         if [ ! -f ${EXTDIR}/default/rc          ]; then install -m ${CONFMODE} default/rc          ${EXTDIR}/default/; fi
    89         if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
    90         install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
     88        if [ ! -f ${DESTDIR}/etc/default/rc          ]; then install -m ${CONFMODE} default/rc          ${DESTDIR}/etc/default/; fi
    9189        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs
    9290        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/cleanfs

  • lsb-bootscripts/etc/default/rc

    r283fea13 r5393dbc  
    1111
    1212# Set base directory information
    13 RC_BASE="/etc"
     13RC_BASE="ETCDIR"
    1414
    1515# Location of network device scripts and config files
Note: See TracChangeset for help on using the changeset viewer.