source:
patches/bootscripts-cross-lfs-3.0-20140710-tools_updates-2.patch@
89693f2
Last change on this file since 89693f2 was a1f098b, checked in by , 10 years ago | |
---|---|
|
|
File size: 15.2 KB |
-
bootscripts-cross-lfs-3.0-pre1
Submitted By: William Harrington (kb0iic at cross-lfs dot org) Date: 2014-05-17 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/clfs/init.d/checkfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/checkfs
old new 25 25 # 26 26 ######################################################################### 27 27 28 . / etc/sysconfig/rc28 . /tools/etc/sysconfig/rc 29 29 . ${rc_functions} 30 30 31 31 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 # Function to create files/directory on boot. 19 19 create_files() { 20 20 # Read in the configuration file. 21 exec 9>&0 < / etc/sysconfig/createfiles21 exec 9>&0 < /tools/etc/sysconfig/createfiles 22 22 while read name type perm usr grp dtype maj min junk 23 23 do 24 24 … … 87 87 (exit ${failed}) 88 88 evaluate_retval 89 89 boot_mesg "" ${NORMAL} 90 if [ -e / etc/sysconfig/createfiles ]; then91 if egrep -qv '^(#|$)' / etc/sysconfig/createfiles 2>/dev/null; then90 if [ -e /tools/etc/sysconfig/createfiles ]; then 91 if egrep -qv '^(#|$)' /tools/etc/sysconfig/createfiles 2>/dev/null; then 92 92 boot_mesg "Creating files and directories..." 93 93 create_files 94 94 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 13 13 # 14 14 ######################################################################## 15 15 16 . / etc/sysconfig/rc16 . /tools/etc/sysconfig/rc 17 17 . ${rc_functions} 18 18 19 19 # set the default loglevel 20 20 LOGLEVEL=7 21 if [ -r / etc/sysconfig/console ]; then22 . / etc/sysconfig/console21 if [ -r /tools/etc/sysconfig/console ]; then 22 . /tools/etc/sysconfig/console 23 23 fi 24 24 25 25 case "${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 13 13 # 14 14 ######################################################################## 15 15 16 if [ -e / etc/sysconfig/lcd ]; then16 if [ -e /tools/etc/sysconfig/lcd ]; then 17 17 if [ -e /dev/lcd ]; then 18 source / etc/sysconfig/lcd18 source /tools/etc/sysconfig/lcd 19 19 fi 20 20 fi 21 21 22 if [ -e / etc/sysconfig/bootscripts ]; then23 source / etc/sysconfig/bootscripts22 if [ -e /tools/etc/sysconfig/bootscripts ]; then 23 source /tools/etc/sysconfig/bootscripts 24 24 fi 25 25 26 26 ## Environmental setup -
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 13 13 # 14 14 ######################################################################## 15 15 16 if [ -e / etc/sysconfig/lcd ]; then16 if [ -e /tools/etc/sysconfig/lcd ]; then 17 17 if [ -e /dev/lcd ]; then 18 source / etc/sysconfig/lcd18 source /tools/etc/sysconfig/lcd 19 19 fi 20 20 fi 21 21 22 if [ -e / etc/sysconfig/bootscripts ]; then23 source / etc/sysconfig/bootscripts22 if [ -e /tools/etc/sysconfig/bootscripts ]; then 23 source /tools/etc/sysconfig/bootscripts 24 24 fi 25 25 26 26 ## Environmental setup -
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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 if [ -f / etc/sysconfig/i18n ]; then19 . / etc/sysconfig/i18n18 if [ -f /tools/etc/sysconfig/i18n ]; then 19 . /tools/etc/sysconfig/i18n 20 20 fi 21 21 22 22 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 . / etc/sysconfig/network17 . /tools/etc/sysconfig/network 18 18 19 19 case "${1}" in 20 20 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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 # Assure that the kernel has module support. … … 23 23 24 24 # Exit if there's no modules file or there are no 25 25 # 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 || 28 28 exit 0 29 29 30 30 boot_mesg -n "Loading modules:" ${INFO} … … 49 49 else 50 50 failedmod="${failedmod} ${module}" 51 51 fi 52 done < / etc/sysconfig/modules52 done < /tools/etc/sysconfig/modules 53 53 54 54 boot_mesg "" ${NORMAL} 55 55 # 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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${1}" in -
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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 14 14 # 15 15 ######################################################################## 16 16 17 . / etc/sysconfig/rc17 . /tools/etc/sysconfig/rc 18 18 . ${rc_functions} 19 . / etc/sysconfig/network19 . /tools/etc/sysconfig/network 20 20 21 21 case "${1}" in 22 22 start) … … 70 70 ;; 71 71 esac 72 72 73 # End / etc/rc.d/init.d/network73 # 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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . $rc_functions 17 17 18 18 case "$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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 # 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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 . / etc/sysconfig/clock17 . /tools/etc/sysconfig/clock 18 18 19 19 CLOCKPARAMS= 20 20 -
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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . $rc_functions 17 17 18 18 case "$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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 14 14 # 15 15 ######################################################################## 16 16 17 . / etc/sysconfig/rc17 . /tools/etc/sysconfig/rc 18 18 . ${rc_functions} 19 19 20 20 case "${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 12 12 # 13 13 ######################################################################## 14 14 15 . / etc/sysconfig/rc15 . /tools/etc/sysconfig/rc 16 16 . ${rc_functions} 17 17 18 18 case "${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 16 16 # 17 17 ######################################################################## 18 18 19 . / etc/sysconfig/rc19 . /tools/etc/sysconfig/rc 20 20 . ${rc_functions} 21 21 22 22 case "$1" in … … 25 25 26 26 # start udevd 27 27 boot_mesg "\nStarting udevd..." 28 / sbin/udevd --daemon28 /tools/sbin/udevd --daemon 29 29 evaluate_retval 30 30 31 31 # start coldplugging … … 35 35 #mkdir -p /run/.udev/queue 36 36 37 37 # configure all devices 38 / sbin/udevadm trigger --action=add --type=subsystems39 / sbin/udevadm trigger --action=add --type=devices38 /tools/sbin/udevadm trigger --action=add --type=subsystems 39 /tools/sbin/udevadm trigger --action=add --type=devices 40 40 41 41 # this replaces the old loop, exits after all devices are done 42 / sbin/udevadm settle42 /tools/sbin/udevadm settle 43 43 44 44 echo_ok 45 45 ;; 46 46 47 47 stop) 48 48 boot_mesg "Stopping udevd..." 49 killproc / sbin/udevd49 killproc /tools/sbin/udevd 50 50 ;; 51 51 52 52 restart) 53 53 boot_mesg "Restarting udevd..." 54 killproc / sbin/udevd55 loadproc / sbin/udevd --daemon54 killproc /tools/sbin/udevd 55 loadproc /tools/sbin/udevd --daemon 56 56 evaluate_retval 57 57 ;; 58 58 59 59 status) 60 statusproc / sbin/udevd60 statusproc /tools/sbin/udevd 61 61 ;; 62 62 63 63 *) -
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 11 11 # 12 12 ######################################################################## 13 13 14 rc_base=/ etc/rc.d14 rc_base=/tools/etc/rc.d 15 15 rc_functions=${rc_base}/init.d/functions 16 16 network_devices=/etc/sysconfig/network-devices 17 17
Note:
See TracBrowser
for help on using the repository browser.