[21f4832] | 1 | Submitted By: William Harrington (kb0iic at cross-lfs dot org)
|
---|
| 2 | Date: 2014-05-16
|
---|
| 3 | Initial Package Version: 3.1-pre1
|
---|
| 4 | Origin: Idea for cleaning up boot chapter by Chris Staub
|
---|
| 5 | Upstream Status: Not Applied - CLFS Specific
|
---|
| 6 | Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible.
|
---|
| 7 |
|
---|
| 8 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/Makefile bootscripts-cross-lfs-2.1-pre1/Makefile
|
---|
| 9 | --- bootscripts-cross-lfs-2.1-pre1.orig/Makefile 2014-04-12 13:37:45.000000000 -0400
|
---|
| 10 | +++ bootscripts-cross-lfs-2.1-pre1/Makefile 2014-04-13 15:52:56.000000000 -0400
|
---|
| 11 | @@ -118,7 +118,6 @@
|
---|
| 12 | if [ ! -f ${EXTDIR}/sysconfig/i18n ]; then install -m ${CONFMODE} clfs/sysconfig/i18n ${EXTDIR}/sysconfig/; fi
|
---|
| 13 | if [ ! -f ${EXTDIR}/sysconfig/modules ]; then install -m ${CONFMODE} clfs/sysconfig/modules ${EXTDIR}/sysconfig/; fi
|
---|
| 14 | if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
|
---|
| 15 | - @$(MAKE) mknod_devices
|
---|
| 16 |
|
---|
| 17 | install-network: create-dirs create-service-dir
|
---|
| 18 |
|
---|
| 19 | @@ -138,7 +137,7 @@
|
---|
| 20 | install-service-mtu: create-service-dir
|
---|
| 21 | install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
|
---|
| 22 |
|
---|
| 23 | -install-minimal: create-dirs create-service-dir udev_device_dirs udev_device_links
|
---|
| 24 | +install-minimal: create-dirs create-service-dir
|
---|
| 25 | 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
|
---|
| 26 | install -m ${MODE} clfs/init.d/checkfs ${EXTDIR}/rc.d/init.d/
|
---|
| 27 | install -m ${MODE} clfs/init.d/cleanfs ${EXTDIR}/rc.d/init.d/
|
---|
| 28 | @@ -170,7 +169,6 @@
|
---|
| 29 | ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
|
---|
| 30 | if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} clfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
|
---|
| 31 | if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} clfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
|
---|
| 32 | - @$(MAKE) mknod_devices
|
---|
| 33 |
|
---|
| 34 | install-raq2: create-dirs
|
---|
| 35 | install -m ${MODE} clfs/init.d/paneld ${EXTDIR}/rc.d/init.d/
|
---|
| 36 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs
|
---|
| 37 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs 2014-04-12 13:37:45.000000000 -0400
|
---|
| 38 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs 2014-04-13 15:53:20.000000000 -0400
|
---|
| 39 | @@ -25,7 +25,7 @@
|
---|
| 40 | #
|
---|
| 41 | #########################################################################
|
---|
| 42 |
|
---|
| 43 | -. /etc/sysconfig/rc
|
---|
| 44 | +. /tools/etc/sysconfig/rc
|
---|
| 45 | . ${rc_functions}
|
---|
| 46 |
|
---|
| 47 | case "${1}" in
|
---|
| 48 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs
|
---|
| 49 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs 2014-04-12 13:37:45.000000000 -0400
|
---|
| 50 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs 2014-04-13 15:53:20.000000000 -0400
|
---|
| 51 | @@ -12,13 +12,13 @@
|
---|
| 52 | #
|
---|
| 53 | ########################################################################
|
---|
| 54 |
|
---|
| 55 | -. /etc/sysconfig/rc
|
---|
| 56 | +. /tools/etc/sysconfig/rc
|
---|
| 57 | . ${rc_functions}
|
---|
| 58 |
|
---|
| 59 | # Function to create files/directory on boot.
|
---|
| 60 | create_files() {
|
---|
| 61 | # Read in the configuration file.
|
---|
| 62 | - exec 9>&0 < /etc/sysconfig/createfiles
|
---|
| 63 | + exec 9>&0 < /tools/etc/sysconfig/createfiles
|
---|
| 64 | while read name type perm usr grp dtype maj min junk
|
---|
| 65 | do
|
---|
| 66 |
|
---|
| 67 | @@ -87,8 +87,8 @@
|
---|
| 68 | (exit ${failed})
|
---|
| 69 | evaluate_retval
|
---|
| 70 | boot_mesg "" ${NORMAL}
|
---|
| 71 | - if [ -e /etc/sysconfig/createfiles ]; then
|
---|
| 72 | - if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
|
---|
| 73 | + if [ -e /tools/etc/sysconfig/createfiles ]; then
|
---|
| 74 | + if egrep -qv '^(#|$)' /tools/etc/sysconfig/createfiles 2>/dev/null; then
|
---|
| 75 | boot_mesg "Creating files and directories..."
|
---|
| 76 | create_files
|
---|
| 77 | evaluate_retval
|
---|
| 78 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog
|
---|
| 79 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog 2014-04-12 13:37:45.000000000 -0400
|
---|
| 80 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog 2014-04-13 15:53:20.000000000 -0400
|
---|
| 81 | @@ -13,13 +13,13 @@
|
---|
| 82 | #
|
---|
| 83 | ########################################################################
|
---|
| 84 |
|
---|
| 85 | -. /etc/sysconfig/rc
|
---|
| 86 | +. /tools/etc/sysconfig/rc
|
---|
| 87 | . ${rc_functions}
|
---|
| 88 |
|
---|
| 89 | # set the default loglevel
|
---|
| 90 | LOGLEVEL=7
|
---|
| 91 | -if [ -r /etc/sysconfig/console ]; then
|
---|
| 92 | - . /etc/sysconfig/console
|
---|
| 93 | +if [ -r /tools/etc/sysconfig/console ]; then
|
---|
| 94 | + . /tools/etc/sysconfig/console
|
---|
| 95 | fi
|
---|
| 96 |
|
---|
| 97 | case "${1}" in
|
---|
| 98 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions
|
---|
| 99 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions 2014-04-12 13:37:45.000000000 -0400
|
---|
| 100 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions 2014-04-13 15:53:20.000000000 -0400
|
---|
| 101 | @@ -13,14 +13,14 @@
|
---|
| 102 | #
|
---|
| 103 | ########################################################################
|
---|
| 104 |
|
---|
| 105 | -if [ -e /etc/sysconfig/lcd ]; then
|
---|
| 106 | +if [ -e /tools/etc/sysconfig/lcd ]; then
|
---|
| 107 | if [ -e /dev/lcd ]; then
|
---|
| 108 | - source /etc/sysconfig/lcd
|
---|
| 109 | + source /tools/etc/sysconfig/lcd
|
---|
| 110 | fi
|
---|
| 111 | fi
|
---|
| 112 |
|
---|
| 113 | -if [ -e /etc/sysconfig/bootscripts ]; then
|
---|
| 114 | - source /etc/sysconfig/bootscripts
|
---|
| 115 | +if [ -e /tools/etc/sysconfig/bootscripts ]; then
|
---|
| 116 | + source /tools/etc/sysconfig/bootscripts
|
---|
| 117 | fi
|
---|
| 118 |
|
---|
| 119 | ## Environmental setup
|
---|
| 120 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal
|
---|
| 121 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal 2014-04-12 13:37:45.000000000 -0400
|
---|
| 122 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal 2014-04-13 15:53:20.000000000 -0400
|
---|
| 123 | @@ -13,14 +13,14 @@
|
---|
| 124 | #
|
---|
| 125 | ########################################################################
|
---|
| 126 |
|
---|
| 127 | -if [ -e /etc/sysconfig/lcd ]; then
|
---|
| 128 | +if [ -e /tools/etc/sysconfig/lcd ]; then
|
---|
| 129 | if [ -e /dev/lcd ]; then
|
---|
| 130 | - source /etc/sysconfig/lcd
|
---|
| 131 | + source /tools/etc/sysconfig/lcd
|
---|
| 132 | fi
|
---|
| 133 | fi
|
---|
| 134 |
|
---|
| 135 | -if [ -e /etc/sysconfig/bootscripts ]; then
|
---|
| 136 | - source /etc/sysconfig/bootscripts
|
---|
| 137 | +if [ -e /tools/etc/sysconfig/bootscripts ]; then
|
---|
| 138 | + source /tools/etc/sysconfig/bootscripts
|
---|
| 139 | fi
|
---|
| 140 |
|
---|
| 141 | ## Environmental setup
|
---|
| 142 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt
|
---|
| 143 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt 2014-04-12 13:37:45.000000000 -0400
|
---|
| 144 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt 2014-04-13 15:53:20.000000000 -0400
|
---|
| 145 | @@ -12,7 +12,7 @@
|
---|
| 146 | #
|
---|
| 147 | ########################################################################
|
---|
| 148 |
|
---|
| 149 | -. /etc/sysconfig/rc
|
---|
| 150 | +. /tools/etc/sysconfig/rc
|
---|
| 151 | . ${rc_functions}
|
---|
| 152 |
|
---|
| 153 | case "${1}" in
|
---|
| 154 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n
|
---|
| 155 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n 2014-04-12 13:37:45.000000000 -0400
|
---|
| 156 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n 2014-04-13 15:53:20.000000000 -0400
|
---|
| 157 | @@ -12,11 +12,11 @@
|
---|
| 158 | #
|
---|
| 159 | ########################################################################
|
---|
| 160 |
|
---|
| 161 | -. /etc/sysconfig/rc
|
---|
| 162 | +. /tools/etc/sysconfig/rc
|
---|
| 163 | . ${rc_functions}
|
---|
| 164 |
|
---|
| 165 | -if [ -f /etc/sysconfig/i18n ]; then
|
---|
| 166 | - . /etc/sysconfig/i18n
|
---|
| 167 | +if [ -f /tools/etc/sysconfig/i18n ]; then
|
---|
| 168 | + . /tools/etc/sysconfig/i18n
|
---|
| 169 | fi
|
---|
| 170 |
|
---|
| 171 | case "${1}" in
|
---|
| 172 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet
|
---|
| 173 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet 2014-04-12 13:37:45.000000000 -0400
|
---|
| 174 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet 2014-04-13 15:53:20.000000000 -0400
|
---|
| 175 | @@ -12,9 +12,9 @@
|
---|
| 176 | #
|
---|
| 177 | ########################################################################
|
---|
| 178 |
|
---|
| 179 | -. /etc/sysconfig/rc
|
---|
| 180 | +. /tools/etc/sysconfig/rc
|
---|
| 181 | . ${rc_functions}
|
---|
| 182 | -. /etc/sysconfig/network
|
---|
| 183 | +. /tools/etc/sysconfig/network
|
---|
| 184 |
|
---|
| 185 | case "${1}" in
|
---|
| 186 | start)
|
---|
| 187 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules
|
---|
| 188 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules 2014-04-12 13:37:45.000000000 -0400
|
---|
| 189 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules 2014-04-13 15:53:20.000000000 -0400
|
---|
| 190 | @@ -12,7 +12,7 @@
|
---|
| 191 | #
|
---|
| 192 | ########################################################################
|
---|
| 193 |
|
---|
| 194 | -. /etc/sysconfig/rc
|
---|
| 195 | +. /tools/etc/sysconfig/rc
|
---|
| 196 | . ${rc_functions}
|
---|
| 197 |
|
---|
| 198 | # Assure that the kernel has module support.
|
---|
| 199 | @@ -23,8 +23,8 @@
|
---|
| 200 |
|
---|
| 201 | # Exit if there's no modules file or there are no
|
---|
| 202 | # valid entries
|
---|
| 203 | - [ -r /etc/sysconfig/modules ] &&
|
---|
| 204 | - egrep -qv '^($|#)' /etc/sysconfig/modules ||
|
---|
| 205 | + [ -r /tools/etc/sysconfig/modules ] &&
|
---|
| 206 | + egrep -qv '^($|#)' /tools/etc/sysconfig/modules ||
|
---|
| 207 | exit 0
|
---|
| 208 |
|
---|
| 209 | boot_mesg -n "Loading modules:" ${INFO}
|
---|
| 210 | @@ -49,7 +49,7 @@
|
---|
| 211 | else
|
---|
| 212 | failedmod="${failedmod} ${module}"
|
---|
| 213 | fi
|
---|
| 214 | - done < /etc/sysconfig/modules
|
---|
| 215 | + done < /tools/etc/sysconfig/modules
|
---|
| 216 |
|
---|
| 217 | boot_mesg "" ${NORMAL}
|
---|
| 218 | # Print a message about successfully loaded
|
---|
| 219 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs
|
---|
| 220 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs 2014-04-12 13:37:45.000000000 -0400
|
---|
| 221 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs 2014-04-13 15:53:20.000000000 -0400
|
---|
| 222 | @@ -12,7 +12,7 @@
|
---|
| 223 | #
|
---|
| 224 | ########################################################################
|
---|
| 225 |
|
---|
| 226 | -. /etc/sysconfig/rc
|
---|
| 227 | +. /tools/etc/sysconfig/rc
|
---|
| 228 | . ${rc_functions}
|
---|
| 229 |
|
---|
| 230 | case "${1}" in
|
---|
| 231 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs
|
---|
| 232 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs 2014-04-12 13:37:45.000000000 -0400
|
---|
| 233 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs 2014-04-13 15:53:20.000000000 -0400
|
---|
| 234 | @@ -12,7 +12,7 @@
|
---|
| 235 | #
|
---|
| 236 | ########################################################################
|
---|
| 237 |
|
---|
| 238 | -. /etc/sysconfig/rc
|
---|
| 239 | +. /tools/etc/sysconfig/rc
|
---|
| 240 | . ${rc_functions}
|
---|
| 241 |
|
---|
| 242 | case "${1}" in
|
---|
| 243 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network
|
---|
| 244 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network 2014-04-12 13:37:45.000000000 -0400
|
---|
| 245 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network 2014-04-13 15:53:20.000000000 -0400
|
---|
| 246 | @@ -14,9 +14,9 @@
|
---|
| 247 | #
|
---|
| 248 | ########################################################################
|
---|
| 249 |
|
---|
| 250 | -. /etc/sysconfig/rc
|
---|
| 251 | +. /tools/etc/sysconfig/rc
|
---|
| 252 | . ${rc_functions}
|
---|
| 253 | -. /etc/sysconfig/network
|
---|
| 254 | +. /tools/etc/sysconfig/network
|
---|
| 255 |
|
---|
| 256 | case "${1}" in
|
---|
| 257 | start)
|
---|
| 258 | @@ -70,4 +70,4 @@
|
---|
| 259 | ;;
|
---|
| 260 | esac
|
---|
| 261 |
|
---|
| 262 | -# End /etc/rc.d/init.d/network
|
---|
| 263 | +# End /tools/etc/rc.d/init.d/network
|
---|
| 264 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld
|
---|
| 265 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld 2014-04-12 13:37:45.000000000 -0400
|
---|
| 266 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld 2014-04-13 15:53:20.000000000 -0400
|
---|
| 267 | @@ -12,7 +12,7 @@
|
---|
| 268 | #
|
---|
| 269 | ########################################################################
|
---|
| 270 |
|
---|
| 271 | -. /etc/sysconfig/rc
|
---|
| 272 | +. /tools/etc/sysconfig/rc
|
---|
| 273 | . $rc_functions
|
---|
| 274 |
|
---|
| 275 | case "$1" in
|
---|
| 276 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc
|
---|
| 277 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc 2014-04-12 13:37:45.000000000 -0400
|
---|
| 278 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc 2014-04-13 15:53:20.000000000 -0400
|
---|
| 279 | @@ -12,7 +12,7 @@
|
---|
| 280 | #
|
---|
| 281 | ########################################################################
|
---|
| 282 |
|
---|
| 283 | -. /etc/sysconfig/rc
|
---|
| 284 | +. /tools/etc/sysconfig/rc
|
---|
| 285 | . ${rc_functions}
|
---|
| 286 |
|
---|
| 287 | # This sets a few default terminal options.
|
---|
| 288 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot
|
---|
| 289 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot 2014-04-12 13:37:45.000000000 -0400
|
---|
| 290 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot 2014-04-13 15:53:20.000000000 -0400
|
---|
| 291 | @@ -12,7 +12,7 @@
|
---|
| 292 | #
|
---|
| 293 | ########################################################################
|
---|
| 294 |
|
---|
| 295 | -. /etc/sysconfig/rc
|
---|
| 296 | +. /tools/etc/sysconfig/rc
|
---|
| 297 | . ${rc_functions}
|
---|
| 298 |
|
---|
| 299 | case "${1}" in
|
---|
| 300 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog
|
---|
| 301 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog 2014-04-12 13:37:45.000000000 -0400
|
---|
| 302 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog 2014-04-13 15:53:20.000000000 -0400
|
---|
| 303 | @@ -12,7 +12,7 @@
|
---|
| 304 | #
|
---|
| 305 | ########################################################################
|
---|
| 306 |
|
---|
| 307 | -. /etc/sysconfig/rc
|
---|
| 308 | +. /tools/etc/sysconfig/rc
|
---|
| 309 | . ${rc_functions}
|
---|
| 310 |
|
---|
| 311 | case "${1}" in
|
---|
| 312 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals
|
---|
| 313 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals 2014-04-12 13:37:45.000000000 -0400
|
---|
| 314 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals 2014-04-13 15:53:20.000000000 -0400
|
---|
| 315 | @@ -12,7 +12,7 @@
|
---|
| 316 | #
|
---|
| 317 | ########################################################################
|
---|
| 318 |
|
---|
| 319 | -. /etc/sysconfig/rc
|
---|
| 320 | +. /tools/etc/sysconfig/rc
|
---|
| 321 | . ${rc_functions}
|
---|
| 322 |
|
---|
| 323 | case "${1}" in
|
---|
| 324 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock
|
---|
| 325 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock 2014-04-12 13:37:45.000000000 -0400
|
---|
| 326 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock 2014-04-13 15:53:20.000000000 -0400
|
---|
| 327 | @@ -12,9 +12,9 @@
|
---|
| 328 | #
|
---|
| 329 | ########################################################################
|
---|
| 330 |
|
---|
| 331 | -. /etc/sysconfig/rc
|
---|
| 332 | +. /tools/etc/sysconfig/rc
|
---|
| 333 | . ${rc_functions}
|
---|
| 334 | -. /etc/sysconfig/clock
|
---|
| 335 | +. /tools/etc/sysconfig/clock
|
---|
| 336 |
|
---|
| 337 | CLOCKPARAMS=
|
---|
| 338 |
|
---|
| 339 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd
|
---|
| 340 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd 2014-04-12 13:37:45.000000000 -0400
|
---|
| 341 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd 2014-04-13 15:53:20.000000000 -0400
|
---|
| 342 | @@ -12,7 +12,7 @@
|
---|
| 343 | #
|
---|
| 344 | ########################################################################
|
---|
| 345 |
|
---|
| 346 | -. /etc/sysconfig/rc
|
---|
| 347 | +. /tools/etc/sysconfig/rc
|
---|
| 348 | . $rc_functions
|
---|
| 349 |
|
---|
| 350 | case "$1" in
|
---|
| 351 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap
|
---|
| 352 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap 2014-04-12 13:37:45.000000000 -0400
|
---|
| 353 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap 2014-04-13 15:53:20.000000000 -0400
|
---|
| 354 | @@ -12,7 +12,7 @@
|
---|
| 355 | #
|
---|
| 356 | ########################################################################
|
---|
| 357 |
|
---|
| 358 | -. /etc/sysconfig/rc
|
---|
| 359 | +. /tools/etc/sysconfig/rc
|
---|
| 360 | . ${rc_functions}
|
---|
| 361 |
|
---|
| 362 | case "${1}" in
|
---|
| 363 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl
|
---|
| 364 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl 2014-04-12 13:37:45.000000000 -0400
|
---|
| 365 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl 2014-04-13 15:53:20.000000000 -0400
|
---|
| 366 | @@ -14,7 +14,7 @@
|
---|
| 367 | #
|
---|
| 368 | ########################################################################
|
---|
| 369 |
|
---|
| 370 | -. /etc/sysconfig/rc
|
---|
| 371 | +. /tools/etc/sysconfig/rc
|
---|
| 372 | . ${rc_functions}
|
---|
| 373 |
|
---|
| 374 | case "${1}" in
|
---|
| 375 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template
|
---|
| 376 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template 2014-04-12 13:37:45.000000000 -0400
|
---|
| 377 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template 2014-04-13 15:53:20.000000000 -0400
|
---|
| 378 | @@ -12,7 +12,7 @@
|
---|
| 379 | #
|
---|
| 380 | ########################################################################
|
---|
| 381 |
|
---|
| 382 | -. /etc/sysconfig/rc
|
---|
| 383 | +. /tools/etc/sysconfig/rc
|
---|
| 384 | . ${rc_functions}
|
---|
| 385 |
|
---|
| 386 | case "${1}" in
|
---|
| 387 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev
|
---|
| 388 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev 2014-04-12 13:37:45.000000000 -0400
|
---|
| 389 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev 2014-04-13 15:53:20.000000000 -0400
|
---|
| 390 | @@ -16,7 +16,7 @@
|
---|
| 391 | #
|
---|
| 392 | ########################################################################
|
---|
| 393 |
|
---|
| 394 | -. /etc/sysconfig/rc
|
---|
| 395 | +. /tools/etc/sysconfig/rc
|
---|
| 396 | . ${rc_functions}
|
---|
| 397 |
|
---|
| 398 | case "$1" in
|
---|
| 399 | @@ -25,7 +25,7 @@
|
---|
| 400 |
|
---|
| 401 | # start udevd
|
---|
| 402 | boot_mesg "\nStarting udevd..."
|
---|
| 403 | - /sbin/udevd --daemon
|
---|
| 404 | + /tools/sbin/udevd --daemon
|
---|
| 405 | evaluate_retval
|
---|
| 406 |
|
---|
| 407 | # start coldplugging
|
---|
| 408 | @@ -35,29 +35,29 @@
|
---|
| 409 | #mkdir -p /run/.udev/queue
|
---|
| 410 |
|
---|
| 411 | # configure all devices
|
---|
| 412 | - /sbin/udevadm trigger --action=add --type=subsystems
|
---|
| 413 | - /sbin/udevadm trigger --action=add --type=devices
|
---|
| 414 | + /tools/sbin/udevadm trigger --action=add --type=subsystems
|
---|
| 415 | + /tools/sbin/udevadm trigger --action=add --type=devices
|
---|
| 416 |
|
---|
| 417 | # this replaces the old loop, exits after all devices are done
|
---|
| 418 | - /sbin/udevadm settle
|
---|
| 419 | + /tools/sbin/udevadm settle
|
---|
| 420 |
|
---|
| 421 | echo_ok
|
---|
| 422 | ;;
|
---|
| 423 |
|
---|
| 424 | stop)
|
---|
| 425 | boot_mesg "Stopping udevd..."
|
---|
| 426 | - killproc /sbin/udevd
|
---|
| 427 | + killproc /tools/sbin/udevd
|
---|
| 428 | ;;
|
---|
| 429 |
|
---|
| 430 | restart)
|
---|
| 431 | boot_mesg "Restarting udevd..."
|
---|
| 432 | - killproc /sbin/udevd
|
---|
| 433 | - loadproc /sbin/udevd --daemon
|
---|
| 434 | + killproc /tools/sbin/udevd
|
---|
| 435 | + loadproc /tools/sbin/udevd --daemon
|
---|
| 436 | evaluate_retval
|
---|
| 437 | ;;
|
---|
| 438 |
|
---|
| 439 | status)
|
---|
| 440 | - statusproc /sbin/udevd
|
---|
| 441 | + statusproc /tools/sbin/udevd
|
---|
| 442 | ;;
|
---|
| 443 |
|
---|
| 444 | *)
|
---|
| 445 | diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc
|
---|
| 446 | --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc 2014-04-12 13:37:45.000000000 -0400
|
---|
| 447 | +++ bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc 2014-04-14 00:33:44.000000000 -0400
|
---|
| 448 | @@ -11,7 +11,7 @@
|
---|
| 449 | #
|
---|
| 450 | ########################################################################
|
---|
| 451 |
|
---|
| 452 | -rc_base=/etc/rc.d
|
---|
| 453 | +rc_base=/tools/etc/rc.d
|
---|
| 454 | rc_functions=${rc_base}/init.d/functions
|
---|
| 455 | network_devices=/etc/sysconfig/network-devices
|
---|
| 456 |
|
---|