source: patches/bootscripts-cross-lfs-2.1-pre1-updates-1.patch@ 788695f

clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 788695f was 79536fe, checked in by Chris Staub <chris@…>, 11 years ago

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