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

clfs-3.0.0-sysvinit sysvinit
Last change on this file since 7a306af was f0479aa, checked in by William Harrington <kb0iic@…>, 11 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
RevLine 
[21f4832]1Submitted By: William Harrington (kb0iic at cross-lfs dot org)
2Date: 2014-05-16
3Initial Package Version: 3.1-pre1
4Origin: Idea for cleaning up boot chapter by Chris Staub
5Upstream Status: Not Applied - CLFS Specific
6Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible.
7
[f0479aa]8diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/Makefile bootscripts-cross-lfs-3.0-pre1/Makefile
9--- bootscripts-cross-lfs-3.0-pre1.orig/Makefile 2011-01-09 02:43:16.000000000 +0000
10+++ bootscripts-cross-lfs-3.0-pre1/Makefile 2014-05-17 00:02:04.100001526 +0000
[21f4832]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/
[f0479aa]36diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/checkfs
37--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/checkfs 2009-07-07 01:39:12.000000000 +0000
38+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/checkfs 2014-05-17 00:02:04.100001526 +0000
[21f4832]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
[f0479aa]48diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/cleanfs
49--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/cleanfs 2012-09-05 02:21:09.000000000 +0000
50+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/cleanfs 2014-05-17 00:02:04.100001526 +0000
[21f4832]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
[f0479aa]78diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-3.0-pre1/clfs/init.d/consolelog
79--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/consolelog 2009-07-07 01:39:12.000000000 +0000
80+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/consolelog 2014-05-17 00:02:04.100001526 +0000
[21f4832]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
[f0479aa]98diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions
99--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions 2009-07-07 01:39:12.000000000 +0000
100+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions 2014-05-17 00:03:00.800003131 +0000
[21f4832]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
[f0479aa]120@@ -54,7 +54,7 @@
121 # If formatting is needed, $ECHO should be used
122 case "`echo -e -n test`" in
123 -[en]*)
124- ECHO=/bin/echo
125+ ECHO=/tools/bin/echo
126 ;;
127 *)
128 ECHO=echo
129@@ -153,7 +153,7 @@
130 boot_log()
131 {
132 if [ "$LOGGING" ]; then
133- /bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
134+ /tools/bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
135 else
136 return 0
137 fi
138diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions.minimal
139--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions.minimal 2012-03-13 18:41:15.000000000 +0000
140+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions.minimal 2014-05-17 00:03:59.963337110 +0000
[21f4832]141@@ -13,14 +13,14 @@
142 #
143 ########################################################################
144
145-if [ -e /etc/sysconfig/lcd ]; then
146+if [ -e /tools/etc/sysconfig/lcd ]; then
147 if [ -e /dev/lcd ]; then
148- source /etc/sysconfig/lcd
149+ source /tools/etc/sysconfig/lcd
150 fi
151 fi
152
153-if [ -e /etc/sysconfig/bootscripts ]; then
154- source /etc/sysconfig/bootscripts
155+if [ -e /tools/etc/sysconfig/bootscripts ]; then
156+ source /tools/etc/sysconfig/bootscripts
157 fi
158
159 ## Environmental setup
[f0479aa]160@@ -54,7 +54,7 @@
161 # If formatting is needed, $ECHO should be used
162 case "`echo -e -n test`" in
163 -[en]*)
164- ECHO=/bin/echo
165+ ECHO=/tools/bin/echo
166 ;;
167 *)
168 ECHO=echo
169@@ -153,7 +153,7 @@
170 boot_log()
171 {
172 if [ "$LOGGING" ]; then
173- /bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
174+ /tools/bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
175 else
176 return 0
177 fi
178diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-3.0-pre1/clfs/init.d/halt
179--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/halt 2009-07-07 01:39:12.000000000 +0000
180+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/halt 2014-05-17 00:02:04.103335102 +0000
[21f4832]181@@ -12,7 +12,7 @@
182 #
183 ########################################################################
184
185-. /etc/sysconfig/rc
186+. /tools/etc/sysconfig/rc
187 . ${rc_functions}
188
189 case "${1}" in
[f0479aa]190diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-3.0-pre1/clfs/init.d/i18n
191--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/i18n 2009-07-07 01:39:12.000000000 +0000
192+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/i18n 2014-05-17 00:02:04.103335102 +0000
[21f4832]193@@ -12,11 +12,11 @@
194 #
195 ########################################################################
196
197-. /etc/sysconfig/rc
198+. /tools/etc/sysconfig/rc
199 . ${rc_functions}
200
201-if [ -f /etc/sysconfig/i18n ]; then
202- . /etc/sysconfig/i18n
203+if [ -f /tools/etc/sysconfig/i18n ]; then
204+ . /tools/etc/sysconfig/i18n
205 fi
206
207 case "${1}" in
[f0479aa]208diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-3.0-pre1/clfs/init.d/localnet
209--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/localnet 2009-07-07 01:39:12.000000000 +0000
210+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/localnet 2014-05-17 00:02:04.103335102 +0000
[21f4832]211@@ -12,9 +12,9 @@
212 #
213 ########################################################################
214
215-. /etc/sysconfig/rc
216+. /tools/etc/sysconfig/rc
217 . ${rc_functions}
218-. /etc/sysconfig/network
219+. /tools/etc/sysconfig/network
220
221 case "${1}" in
222 start)
[f0479aa]223diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-3.0-pre1/clfs/init.d/modules
224--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/modules 2009-07-07 01:39:12.000000000 +0000
225+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/modules 2014-05-17 00:02:04.103335102 +0000
[21f4832]226@@ -12,7 +12,7 @@
227 #
228 ########################################################################
229
230-. /etc/sysconfig/rc
231+. /tools/etc/sysconfig/rc
232 . ${rc_functions}
233
234 # Assure that the kernel has module support.
235@@ -23,8 +23,8 @@
236
237 # Exit if there's no modules file or there are no
238 # valid entries
239- [ -r /etc/sysconfig/modules ] &&
240- egrep -qv '^($|#)' /etc/sysconfig/modules ||
241+ [ -r /tools/etc/sysconfig/modules ] &&
242+ egrep -qv '^($|#)' /tools/etc/sysconfig/modules ||
243 exit 0
244
245 boot_mesg -n "Loading modules:" ${INFO}
246@@ -49,7 +49,7 @@
247 else
248 failedmod="${failedmod} ${module}"
249 fi
250- done < /etc/sysconfig/modules
251+ done < /tools/etc/sysconfig/modules
252
253 boot_mesg "" ${NORMAL}
254 # Print a message about successfully loaded
[f0479aa]255diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountfs
256--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountfs 2012-09-05 02:21:09.000000000 +0000
257+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountfs 2014-05-17 00:02:34.460003607 +0000
[21f4832]258@@ -12,7 +12,7 @@
259 #
260 ########################################################################
261
262-. /etc/sysconfig/rc
263+. /tools/etc/sysconfig/rc
264 . ${rc_functions}
265
266 case "${1}" in
[f0479aa]267@@ -24,16 +24,6 @@
268 # Remove fsck-related file system watermarks.
269 rm -f /fastboot /forcefsck
270
271- boot_mesg "Recording existing mounts in /etc/mtab..."
272- > /etc/mtab
273- mount -f / || failed=1
274- mount -f /proc || failed=1
275- mount -f /sys || failed=1
276- mount -f /run || failed=1
277- mount -f /dev || failed=1
278- (exit ${failed})
279- evaluate_retval
280-
281 # This will mount all filesystems that do not have _netdev in
282 # their option list. _netdev denotes a network filesystem.
283 boot_mesg "Mounting remaining file systems..."
284diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountkernfs
285--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountkernfs 2012-09-05 02:21:09.000000000 +0000
286+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountkernfs 2014-05-17 00:02:04.103335102 +0000
[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]296diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-3.0-pre1/clfs/init.d/network
297--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/network 2009-07-07 01:39:12.000000000 +0000
298+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/network 2014-05-17 00:02:04.106668584 +0000
[21f4832]299@@ -14,9 +14,9 @@
300 #
301 ########################################################################
302
303-. /etc/sysconfig/rc
304+. /tools/etc/sysconfig/rc
305 . ${rc_functions}
306-. /etc/sysconfig/network
307+. /tools/etc/sysconfig/network
308
309 case "${1}" in
310 start)
311@@ -70,4 +70,4 @@
312 ;;
313 esac
314
315-# End /etc/rc.d/init.d/network
316+# End /tools/etc/rc.d/init.d/network
[f0479aa]317diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-3.0-pre1/clfs/init.d/paneld
318--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/paneld 2009-07-07 01:39:12.000000000 +0000
319+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/paneld 2014-05-17 00:02:04.106668584 +0000
[21f4832]320@@ -12,7 +12,7 @@
321 #
322 ########################################################################
323
324-. /etc/sysconfig/rc
325+. /tools/etc/sysconfig/rc
326 . $rc_functions
327
328 case "$1" in
[f0479aa]329diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rc
330--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rc 2009-07-07 01:39:12.000000000 +0000
331+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rc 2014-05-17 00:02:04.106668584 +0000
[21f4832]332@@ -12,7 +12,7 @@
333 #
334 ########################################################################
335
336-. /etc/sysconfig/rc
337+. /tools/etc/sysconfig/rc
338 . ${rc_functions}
339
340 # This sets a few default terminal options.
[f0479aa]341diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-3.0-pre1/clfs/init.d/reboot
342--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/reboot 2009-07-07 01:39:12.000000000 +0000
343+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/reboot 2014-05-17 00:02:04.106668584 +0000
[21f4832]344@@ -12,7 +12,7 @@
345 #
346 ########################################################################
347
348-. /etc/sysconfig/rc
349+. /tools/etc/sysconfig/rc
350 . ${rc_functions}
351
352 case "${1}" in
[f0479aa]353diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rsyslog
354--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rsyslog 2009-07-07 01:39:12.000000000 +0000
355+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rsyslog 2014-05-17 00:02:04.106668584 +0000
[21f4832]356@@ -12,7 +12,7 @@
357 #
358 ########################################################################
359
360-. /etc/sysconfig/rc
361+. /tools/etc/sysconfig/rc
362 . ${rc_functions}
363
364 case "${1}" in
[f0479aa]365diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sendsignals
366--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sendsignals 2012-09-05 02:21:09.000000000 +0000
367+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sendsignals 2014-05-17 00:02:04.110002078 +0000
[21f4832]368@@ -12,7 +12,7 @@
369 #
370 ########################################################################
371
372-. /etc/sysconfig/rc
373+. /tools/etc/sysconfig/rc
374 . ${rc_functions}
375
376 case "${1}" in
[f0479aa]377diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setclock
378--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setclock 2009-07-07 01:39:12.000000000 +0000
379+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setclock 2014-05-17 00:02:04.110002078 +0000
[21f4832]380@@ -12,9 +12,9 @@
381 #
382 ########################################################################
383
384-. /etc/sysconfig/rc
385+. /tools/etc/sysconfig/rc
386 . ${rc_functions}
387-. /etc/sysconfig/clock
388+. /tools/etc/sysconfig/clock
389
390 CLOCKPARAMS=
391
[f0479aa]392diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setlcd
393--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setlcd 2009-07-07 01:39:12.000000000 +0000
394+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setlcd 2014-05-17 00:02:04.110002078 +0000
[21f4832]395@@ -12,7 +12,7 @@
396 #
397 ########################################################################
398
399-. /etc/sysconfig/rc
400+. /tools/etc/sysconfig/rc
401 . $rc_functions
402
403 case "$1" in
[f0479aa]404diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-3.0-pre1/clfs/init.d/swap
405--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/swap 2009-07-07 01:39:12.000000000 +0000
406+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/swap 2014-05-17 00:02:04.110002078 +0000
[21f4832]407@@ -12,7 +12,7 @@
408 #
409 ########################################################################
410
411-. /etc/sysconfig/rc
412+. /tools/etc/sysconfig/rc
413 . ${rc_functions}
414
415 case "${1}" in
[f0479aa]416diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sysctl
417--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sysctl 2009-07-07 01:39:12.000000000 +0000
418+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sysctl 2014-05-17 00:02:04.110002078 +0000
[21f4832]419@@ -14,7 +14,7 @@
420 #
421 ########################################################################
422
423-. /etc/sysconfig/rc
424+. /tools/etc/sysconfig/rc
425 . ${rc_functions}
426
427 case "${1}" in
[f0479aa]428diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-3.0-pre1/clfs/init.d/template
429--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/template 2009-07-07 01:39:12.000000000 +0000
430+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/template 2014-05-17 00:02:04.110002078 +0000
[21f4832]431@@ -12,7 +12,7 @@
432 #
433 ########################################################################
434
435-. /etc/sysconfig/rc
436+. /tools/etc/sysconfig/rc
437 . ${rc_functions}
438
439 case "${1}" in
[f0479aa]440diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-3.0-pre1/clfs/init.d/udev
441--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/udev 2013-08-07 19:54:26.000000000 +0000
442+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/udev 2014-05-17 00:02:04.113335656 +0000
[21f4832]443@@ -16,7 +16,7 @@
444 #
445 ########################################################################
446
447-. /etc/sysconfig/rc
448+. /tools/etc/sysconfig/rc
449 . ${rc_functions}
450
451 case "$1" in
452@@ -25,7 +25,7 @@
453
454 # start udevd
455 boot_mesg "\nStarting udevd..."
456- /sbin/udevd --daemon
457+ /tools/sbin/udevd --daemon
458 evaluate_retval
459
460 # start coldplugging
461@@ -35,29 +35,29 @@
462 #mkdir -p /run/.udev/queue
463
464 # configure all devices
465- /sbin/udevadm trigger --action=add --type=subsystems
466- /sbin/udevadm trigger --action=add --type=devices
467+ /tools/sbin/udevadm trigger --action=add --type=subsystems
468+ /tools/sbin/udevadm trigger --action=add --type=devices
469
470 # this replaces the old loop, exits after all devices are done
471- /sbin/udevadm settle
472+ /tools/sbin/udevadm settle
473
474 echo_ok
475 ;;
476
477 stop)
478 boot_mesg "Stopping udevd..."
479- killproc /sbin/udevd
480+ killproc /tools/sbin/udevd
481 ;;
482
483 restart)
484 boot_mesg "Restarting udevd..."
485- killproc /sbin/udevd
486- loadproc /sbin/udevd --daemon
487+ killproc /tools/sbin/udevd
488+ loadproc /tools/sbin/udevd --daemon
489 evaluate_retval
490 ;;
491
492 status)
493- statusproc /sbin/udevd
494+ statusproc /tools/sbin/udevd
495 ;;
496
497 *)
[f0479aa]498diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-3.0-pre1/clfs/sysconfig/rc
499--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/sysconfig/rc 2009-07-07 01:39:12.000000000 +0000
500+++ bootscripts-cross-lfs-3.0-pre1/clfs/sysconfig/rc 2014-05-17 00:03:44.446670264 +0000
501@@ -11,8 +11,8 @@
[21f4832]502 #
503 ########################################################################
504
505-rc_base=/etc/rc.d
506+rc_base=/tools/etc/rc.d
507 rc_functions=${rc_base}/init.d/functions
[f0479aa]508-network_devices=/etc/sysconfig/network-devices
509+network_devices=/tools/etc/sysconfig/network-devices
[21f4832]510
[f0479aa]511 # End /etc/sysconfig/rc
Note: See TracBrowser for help on using the repository browser.