source: patches/bootscripts-cross-lfs-3.0-pre1-tools_updates-1.patch@ cab4105

clfs-3.0.0-sysvinit sysvinit
Last change on this file since cab4105 was f0479aa, checked in by William Harrington <kb0iic@…>, 10 years ago

Fix patch so that when the patch is applied, the installation is identical as to the boot-scripts installation in the systemd book. Now the system will boot properly.
  • Property mode set to 100644
File size: 18.3 KB

  • bootscripts-cross-lfs-3.0-pre1 

    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-3.0-pre1.orig/Makefile bootscripts-cross-lfs-3.0-pre1/Makefile
    old new  
    118118        if [ ! -f ${EXTDIR}/sysconfig/i18n        ]; then install -m ${CONFMODE} clfs/sysconfig/i18n        ${EXTDIR}/sysconfig/; fi
    119119        if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then install -m ${CONFMODE} clfs/sysconfig/modules     ${EXTDIR}/sysconfig/; fi
    120120        if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} clfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
    121         @$(MAKE) mknod_devices
    122121
    123122install-network: create-dirs create-service-dir
    124123
    … …  
    138137install-service-mtu: create-service-dir
    139138        install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
    140139
    141 install-minimal: create-dirs create-service-dir udev_device_dirs udev_device_links
     140install-minimal: create-dirs create-service-dir
    142141        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
    143142        install -m ${MODE} clfs/init.d/checkfs                  ${EXTDIR}/rc.d/init.d/
    144143        install -m ${MODE} clfs/init.d/cleanfs                  ${EXTDIR}/rc.d/init.d/
    … …  
    170169        ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
    171170        if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} clfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
    172171        if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} clfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
    173         @$(MAKE) mknod_devices
    174172
    175173install-raq2: create-dirs
    176174        install -m ${MODE} clfs/init.d/paneld        ${EXTDIR}/rc.d/init.d/

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/checkfs
    old new  
    2525#
    2626#########################################################################
    2727
    28 . /etc/sysconfig/rc
     28. /tools/etc/sysconfig/rc
    2929. ${rc_functions}
    3030
    3131case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/cleanfs
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818# Function to create files/directory on boot.
    1919create_files() {
    2020        # Read in the configuration file.
    21         exec 9>&0 < /etc/sysconfig/createfiles
     21        exec 9>&0 < /tools/etc/sysconfig/createfiles
    2222                while read name type perm usr grp dtype maj min junk
    2323                do
    2424
    … …  
    8787                (exit ${failed})
    8888                evaluate_retval
    8989                boot_mesg "" ${NORMAL}
    90                 if [ -e /etc/sysconfig/createfiles ]; then
    91                         if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
     90                if [ -e /tools/etc/sysconfig/createfiles ]; then
     91                        if egrep -qv '^(#|$)' /tools/etc/sysconfig/createfiles 2>/dev/null; then
    9292                                boot_mesg "Creating files and directories..."
    9393                                create_files
    9494                                evaluate_retval

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-3.0-pre1/clfs/init.d/consolelog
    old new  
    1313#
    1414########################################################################
    1515
    16 . /etc/sysconfig/rc
     16. /tools/etc/sysconfig/rc
    1717. ${rc_functions}
    1818
    1919# set the default loglevel
    2020LOGLEVEL=7
    21 if [ -r /etc/sysconfig/console ]; then
    22         . /etc/sysconfig/console
     21if [ -r /tools/etc/sysconfig/console ]; then
     22        . /tools/etc/sysconfig/console
    2323fi
    2424
    2525case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions
    old new  
    1313#
    1414########################################################################
    1515
    16 if [ -e /etc/sysconfig/lcd ]; then
     16if [ -e /tools/etc/sysconfig/lcd ]; then
    1717        if [ -e /dev/lcd ]; then
    18                 source /etc/sysconfig/lcd
     18                source /tools/etc/sysconfig/lcd
    1919        fi
    2020fi
    2121
    22 if [ -e /etc/sysconfig/bootscripts ]; then
    23         source /etc/sysconfig/bootscripts
     22if [ -e /tools/etc/sysconfig/bootscripts ]; then
     23        source /tools/etc/sysconfig/bootscripts
    2424fi
    2525
    2626## Environmental setup
    … …  
    5454# If formatting is needed, $ECHO should be used
    5555case "`echo -e -n test`" in
    5656        -[en]*)
    57                 ECHO=/bin/echo
     57                ECHO=/tools/bin/echo
    5858                ;;
    5959        *)
    6060                ECHO=echo
    … …  
    153153boot_log()
    154154{
    155155        if [ "$LOGGING" ]; then
    156                 /bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
     156                /tools/bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
    157157        else
    158158                return 0
    159159        fi

  • clfs/init.d/functions.minimal 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions.minimal
    old new  
    1313#
    1414########################################################################
    1515
    16 if [ -e /etc/sysconfig/lcd ]; then
     16if [ -e /tools/etc/sysconfig/lcd ]; then
    1717        if [ -e /dev/lcd ]; then
    18                 source /etc/sysconfig/lcd
     18                source /tools/etc/sysconfig/lcd
    1919        fi
    2020fi
    2121
    22 if [ -e /etc/sysconfig/bootscripts ]; then
    23         source /etc/sysconfig/bootscripts
     22if [ -e /tools/etc/sysconfig/bootscripts ]; then
     23        source /tools/etc/sysconfig/bootscripts
    2424fi
    2525
    2626## Environmental setup
    … …  
    5454# If formatting is needed, $ECHO should be used
    5555case "`echo -e -n test`" in
    5656        -[en]*)
    57                 ECHO=/bin/echo
     57                ECHO=/tools/bin/echo
    5858                ;;
    5959        *)
    6060                ECHO=echo
    … …  
    153153boot_log()
    154154{
    155155        if [ "$LOGGING" ]; then
    156                 /bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
     156                /tools/bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
    157157        else
    158158                return 0
    159159        fi

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-3.0-pre1/clfs/init.d/halt
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-3.0-pre1/clfs/init.d/i18n
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    18 if [ -f /etc/sysconfig/i18n ]; then
    19         . /etc/sysconfig/i18n
     18if [ -f /tools/etc/sysconfig/i18n ]; then
     19        . /tools/etc/sysconfig/i18n
    2020fi
    2121
    2222case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-3.0-pre1/clfs/init.d/localnet
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    17 . /etc/sysconfig/network
     17. /tools/etc/sysconfig/network
    1818
    1919case "${1}" in
    2020        start)

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-3.0-pre1/clfs/init.d/modules
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818# Assure that the kernel has module support.
    … …  
    2323
    2424                # Exit if there's no modules file or there are no
    2525                # valid entries
    26                 [ -r /etc/sysconfig/modules ] &&
    27                         egrep -qv '^($|#)' /etc/sysconfig/modules ||
     26                [ -r /tools/etc/sysconfig/modules ] &&
     27                        egrep -qv '^($|#)' /tools/etc/sysconfig/modules ||
    2828                        exit 0
    2929
    3030                boot_mesg -n "Loading modules:" ${INFO}
    … …  
    4949                        else
    5050                                failedmod="${failedmod} ${module}"
    5151                        fi
    52                 done < /etc/sysconfig/modules
     52                done < /tools/etc/sysconfig/modules
    5353
    5454                boot_mesg "" ${NORMAL}
    5555                # Print a message about successfully loaded

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountfs
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in
    … …  
    2424                # Remove fsck-related file system watermarks.
    2525                rm -f /fastboot /forcefsck
    2626
    27                 boot_mesg "Recording existing mounts in /etc/mtab..."
    28                 > /etc/mtab
    29                 mount -f / || failed=1
    30                 mount -f /proc || failed=1
    31                 mount -f /sys || failed=1
    32                 mount -f /run || failed=1
    33                 mount -f /dev || failed=1
    34                 (exit ${failed})
    35                 evaluate_retval
    36 
    3727                # This will mount all filesystems that do not have _netdev in
    3828                # their option list.  _netdev denotes a network filesystem.
    3929                boot_mesg "Mounting remaining file systems..."

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountkernfs
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-3.0-pre1/clfs/init.d/network
    old new  
    1414#
    1515########################################################################
    1616
    17 . /etc/sysconfig/rc
     17. /tools/etc/sysconfig/rc
    1818. ${rc_functions}
    19 . /etc/sysconfig/network
     19. /tools/etc/sysconfig/network
    2020
    2121case "${1}" in
    2222        start)
    … …  
    7070                ;;
    7171esac
    7272
    73 # End /etc/rc.d/init.d/network
     73# End /tools/etc/rc.d/init.d/network

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-3.0-pre1/clfs/init.d/paneld
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. $rc_functions
    1717
    1818case "$1" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rc
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818# This sets a few default terminal options.

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-3.0-pre1/clfs/init.d/reboot
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rsyslog
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sendsignals
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setclock
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    17 . /etc/sysconfig/clock
     17. /tools/etc/sysconfig/clock
    1818
    1919CLOCKPARAMS=
    2020

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setlcd
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. $rc_functions
    1717
    1818case "$1" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-3.0-pre1/clfs/init.d/swap
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sysctl
    old new  
    1414#
    1515########################################################################
    1616
    17 . /etc/sysconfig/rc
     17. /tools/etc/sysconfig/rc
    1818. ${rc_functions}
    1919
    2020case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-3.0-pre1/clfs/init.d/template
    old new  
    1212#
    1313########################################################################
    1414
    15 . /etc/sysconfig/rc
     15. /tools/etc/sysconfig/rc
    1616. ${rc_functions}
    1717
    1818case "${1}" in

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-3.0-pre1/clfs/init.d/udev
    old new  
    1616#
    1717########################################################################
    1818
    19 . /etc/sysconfig/rc
     19. /tools/etc/sysconfig/rc
    2020. ${rc_functions}
    2121
    2222case "$1" in
    … …  
    2525
    2626        # start udevd
    2727        boot_mesg "\nStarting udevd..."
    28         /sbin/udevd --daemon
     28        /tools/sbin/udevd --daemon
    2929        evaluate_retval
    3030
    3131        # start coldplugging
    … …  
    3535        #mkdir -p /run/.udev/queue
    3636
    3737        # configure all devices
    38         /sbin/udevadm trigger --action=add --type=subsystems
    39         /sbin/udevadm trigger --action=add --type=devices
     38        /tools/sbin/udevadm trigger --action=add --type=subsystems
     39        /tools/sbin/udevadm trigger --action=add --type=devices
    4040       
    4141        # this replaces the old loop, exits after all devices are done
    42         /sbin/udevadm settle
     42        /tools/sbin/udevadm settle
    4343
    4444        echo_ok
    4545        ;;
    4646
    4747    stop)
    4848        boot_mesg "Stopping udevd..."
    49         killproc /sbin/udevd
     49        killproc /tools/sbin/udevd
    5050        ;;
    5151
    5252    restart)
    5353        boot_mesg "Restarting udevd..."
    54         killproc /sbin/udevd
    55         loadproc /sbin/udevd --daemon
     54        killproc /tools/sbin/udevd
     55        loadproc /tools/sbin/udevd --daemon
    5656        evaluate_retval
    5757        ;;
    5858
    5959    status)
    60         statusproc /sbin/udevd
     60        statusproc /tools/sbin/udevd
    6161        ;;
    6262
    6363    *)

  • bootscripts-cross-lfs-3.0-pre1 

    diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-3.0-pre1/clfs/sysconfig/rc
    old new  
    1111#
    1212########################################################################
    1313
    14 rc_base=/etc/rc.d
     14rc_base=/tools/etc/rc.d
    1515rc_functions=${rc_base}/init.d/functions
    16 network_devices=/etc/sysconfig/network-devices
     16network_devices=/tools/etc/sysconfig/network-devices
    1717
    1818# End /etc/sysconfig/rc
Note: See TracBrowser for help on using the repository browser.