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