Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, sh/, init.d.misc/
Date: Sun, 24 Feb 2013 03:38:52
Message-Id: 1361673039.8a44067838e268db88ea2158258f8006cb1344b7.WilliamH@OpenRC
1 commit: 8a44067838e268db88ea2158258f8006cb1344b7
2 Author: Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 12 22:09:50 2013 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 24 02:30:39 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8a440678
7
8 Fix shebangs in services to point to the correct location of runscript
9
10 SBINDIR and BINDIR can be set independently of PREFIX. This fixes
11 broken shebangs in service files when SBINDIR is set to something other
12 than PREFIX/sbin
13
14 Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>
15
16 ---
17 init.d.misc/avahi-dnsconfd.in | 2 +-
18 init.d.misc/avahid.in | 2 +-
19 init.d.misc/dbus.in | 2 +-
20 init.d.misc/dhcpcd.in | 2 +-
21 init.d.misc/dnsmasq.in | 2 +-
22 init.d.misc/hald.in | 2 +-
23 init.d.misc/named.in | 2 +-
24 init.d.misc/ntpd.in | 2 +-
25 init.d.misc/openvpn.in | 2 +-
26 init.d.misc/polkitd.in | 2 +-
27 init.d.misc/sshd.in | 2 +-
28 init.d.misc/wpa_supplicant.in | 2 +-
29 init.d/adjkerntz.in | 2 +-
30 init.d/bootmisc.in | 2 +-
31 init.d/consolefont.in | 2 +-
32 init.d/devd.in | 2 +-
33 init.d/devdb.in | 2 +-
34 init.d/devfs.in | 2 +-
35 init.d/dmesg.in | 2 +-
36 init.d/dumpon.in | 2 +-
37 init.d/encswap.in | 2 +-
38 init.d/fsck.in | 2 +-
39 init.d/hostid.in | 2 +-
40 init.d/hostname.in | 2 +-
41 init.d/hwclock.in | 2 +-
42 init.d/ipfw.in | 2 +-
43 init.d/keymaps.in | 2 +-
44 init.d/killprocs.in | 2 +-
45 init.d/local.in | 2 +-
46 init.d/localmount.in | 2 +-
47 init.d/mixer.in | 2 +-
48 init.d/modules.in | 2 +-
49 init.d/mount-ro.in | 2 +-
50 init.d/moused.in | 2 +-
51 init.d/mtab.in | 2 +-
52 init.d/net.lo.in | 2 +-
53 init.d/netmount.in | 2 +-
54 init.d/network.in | 2 +-
55 init.d/newsyslog.in | 2 +-
56 init.d/nscd.in | 2 +-
57 init.d/numlock.in | 2 +-
58 init.d/pf.in | 2 +-
59 init.d/powerd.in | 2 +-
60 init.d/procfs.in | 2 +-
61 init.d/rarpd.in | 2 +-
62 init.d/rc-enabled.in | 2 +-
63 init.d/root.in | 2 +-
64 init.d/rpcbind.in | 2 +-
65 init.d/savecache.in | 2 +-
66 init.d/savecore.in | 2 +-
67 init.d/staticroute.in | 2 +-
68 init.d/swap-blk.in | 2 +-
69 init.d/swap.in | 2 +-
70 init.d/swapfiles.in | 2 +-
71 init.d/swclock.in | 4 ++--
72 init.d/syscons.in | 2 +-
73 init.d/sysctl.BSD.in | 2 +-
74 init.d/sysctl.Linux.in | 2 +-
75 init.d/sysfs.in | 2 +-
76 init.d/syslogd.in | 2 +-
77 init.d/termencoding.in | 2 +-
78 init.d/tmpfiles.setup.in | 2 +-
79 init.d/ttys.in | 2 +-
80 init.d/urandom.in | 2 +-
81 init.d/wscons.in | 2 +-
82 sh/gendepends.sh.in | 4 ++--
83 66 files changed, 68 insertions(+), 68 deletions(-)
84
85 diff --git a/init.d.misc/avahi-dnsconfd.in b/init.d.misc/avahi-dnsconfd.in
86 index 423ec91..abe2d22 100644
87 --- a/init.d.misc/avahi-dnsconfd.in
88 +++ b/init.d.misc/avahi-dnsconfd.in
89 @@ -1,4 +1,4 @@
90 -#!@PREFIX@/sbin/runscript
91 +#!@SBINDIR@/runscript
92 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
93 # Released under the 2-clause BSD license.
94
95
96 diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in
97 index ebda61c..ea2241b 100644
98 --- a/init.d.misc/avahid.in
99 +++ b/init.d.misc/avahid.in
100 @@ -1,4 +1,4 @@
101 -#!@PREFIX@/sbin/runscript
102 +#!@SBINDIR@/runscript
103 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
104 # Released under the 2-clause BSD license.
105
106
107 diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
108 index 94057b9..d0004e7 100644
109 --- a/init.d.misc/dbus.in
110 +++ b/init.d.misc/dbus.in
111 @@ -1,4 +1,4 @@
112 -#!@PREFIX@/sbin/runscript
113 +#!@SBINDIR@/runscript
114 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
115 # Released under the 2-clause BSD license.
116
117
118 diff --git a/init.d.misc/dhcpcd.in b/init.d.misc/dhcpcd.in
119 index 9e8469e..b22d4d1 100644
120 --- a/init.d.misc/dhcpcd.in
121 +++ b/init.d.misc/dhcpcd.in
122 @@ -1,4 +1,4 @@
123 -#!@PREFIX@/sbin/runscript
124 +#!@SBINDIR@/runscript
125 # Copyright (c) 2009 Roy Marples <roy@×××××××.name>
126 # Released under the 2-clause BSD license.
127
128
129 diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in
130 index 1d5c9aa..bdb0411 100644
131 --- a/init.d.misc/dnsmasq.in
132 +++ b/init.d.misc/dnsmasq.in
133 @@ -1,4 +1,4 @@
134 -#!@PREFIX@/sbin/runscript
135 +#!@SBINDIR@/runscript
136 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
137 # Released under the 2-clause BSD license.
138
139
140 diff --git a/init.d.misc/hald.in b/init.d.misc/hald.in
141 index 7c28760..741442f 100644
142 --- a/init.d.misc/hald.in
143 +++ b/init.d.misc/hald.in
144 @@ -1,4 +1,4 @@
145 -#!@PREFIX@/sbin/runscript
146 +#!@SBINDIR@/runscript
147 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
148 # Released under the 2-clause BSD license.
149
150
151 diff --git a/init.d.misc/named.in b/init.d.misc/named.in
152 index 4dafd88..924f5b5 100644
153 --- a/init.d.misc/named.in
154 +++ b/init.d.misc/named.in
155 @@ -1,4 +1,4 @@
156 -#!@PREFIX@/sbin/runscript
157 +#!@SBINDIR@/runscript
158 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
159 # Released under the 2-clause BSD license.
160
161
162 diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in
163 index 0036feb..6f18521 100644
164 --- a/init.d.misc/ntpd.in
165 +++ b/init.d.misc/ntpd.in
166 @@ -1,4 +1,4 @@
167 -#!@PREFIX@/sbin/runscript
168 +#!@SBINDIR@/runscript
169 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
170 # Released under the 2-clause BSD license.
171
172
173 diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
174 index ef37e19..7915623 100644
175 --- a/init.d.misc/openvpn.in
176 +++ b/init.d.misc/openvpn.in
177 @@ -1,4 +1,4 @@
178 -#!@PREFIX@/sbin/runscript
179 +#!@SBINDIR@/runscript
180 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
181 # Released under the 2-clause BSD license.
182
183
184 diff --git a/init.d.misc/polkitd.in b/init.d.misc/polkitd.in
185 index 2fac385..fda0764 100644
186 --- a/init.d.misc/polkitd.in
187 +++ b/init.d.misc/polkitd.in
188 @@ -1,4 +1,4 @@
189 -#!@PREFIX@/sbin/runscript
190 +#!@SBINDIR@/runscript
191 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
192 # Released under the 2-clause BSD license.
193
194
195 diff --git a/init.d.misc/sshd.in b/init.d.misc/sshd.in
196 index 20be770..7efb666 100644
197 --- a/init.d.misc/sshd.in
198 +++ b/init.d.misc/sshd.in
199 @@ -1,4 +1,4 @@
200 -#!@PREFIX@/sbin/runscript
201 +#!@SBINDIR@/runscript
202 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
203 # Released under the 2-clause BSD license.
204
205
206 diff --git a/init.d.misc/wpa_supplicant.in b/init.d.misc/wpa_supplicant.in
207 index 22d7e0f..f908e36 100644
208 --- a/init.d.misc/wpa_supplicant.in
209 +++ b/init.d.misc/wpa_supplicant.in
210 @@ -1,4 +1,4 @@
211 -#!@PREFIX@/sbin/runscript
212 +#!@SBINDIR@/runscript
213 # Copyright (c) 2009 Roy Marples <roy@×××××××.name>
214 # Released under the 2-clause BSD license.
215
216
217 diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in
218 index 76ad175..d1349c8 100644
219 --- a/init.d/adjkerntz.in
220 +++ b/init.d/adjkerntz.in
221 @@ -1,4 +1,4 @@
222 -#!@PREFIX@/sbin/runscript
223 +#!@SBINDIR@/runscript
224 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
225 # Released under the 2-clause BSD license.
226
227
228 diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
229 index 4fdb433..565f6f2 100644
230 --- a/init.d/bootmisc.in
231 +++ b/init.d/bootmisc.in
232 @@ -1,4 +1,4 @@
233 -#!@PREFIX@/sbin/runscript
234 +#!@SBINDIR@/runscript
235 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
236 # Released under the 2-clause BSD license.
237
238
239 diff --git a/init.d/consolefont.in b/init.d/consolefont.in
240 index 0e91d13..61e76c3 100644
241 --- a/init.d/consolefont.in
242 +++ b/init.d/consolefont.in
243 @@ -1,4 +1,4 @@
244 -#!@PREFIX@/sbin/runscript
245 +#!@SBINDIR@/runscript
246 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
247 # Released under the 2-clause BSD license.
248
249
250 diff --git a/init.d/devd.in b/init.d/devd.in
251 index b474b75..395dfa7 100644
252 --- a/init.d/devd.in
253 +++ b/init.d/devd.in
254 @@ -1,4 +1,4 @@
255 -#!@PREFIX@/sbin/runscript
256 +#!@SBINDIR@/runscript
257 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
258 # Released under the 2-clause BSD license.
259
260
261 diff --git a/init.d/devdb.in b/init.d/devdb.in
262 index fcf2597..9213758 100644
263 --- a/init.d/devdb.in
264 +++ b/init.d/devdb.in
265 @@ -1,4 +1,4 @@
266 -#!@PREFIX@/sbin/runscript
267 +#!@SBINDIR@/runscript
268 # Copyright (c) 2008 Roy Marples <roy@×××××××.name>
269 # Released under the 2-clause BSD license.
270
271
272 diff --git a/init.d/devfs.in b/init.d/devfs.in
273 index 2834654..36955f3 100644
274 --- a/init.d/devfs.in
275 +++ b/init.d/devfs.in
276 @@ -1,4 +1,4 @@
277 -#!@PREFIX@/sbin/runscript
278 +#!@SBINDIR@/runscript
279 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
280 # Released under the 2-clause BSD license.
281
282
283 diff --git a/init.d/dmesg.in b/init.d/dmesg.in
284 index 1188483..1c72f76 100644
285 --- a/init.d/dmesg.in
286 +++ b/init.d/dmesg.in
287 @@ -1,4 +1,4 @@
288 -#!@PREFIX@/sbin/runscript
289 +#!@SBINDIR@/runscript
290 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
291 # Released under the 2-clause BSD license.
292
293
294 diff --git a/init.d/dumpon.in b/init.d/dumpon.in
295 index 4450bf9..fdbdd49 100644
296 --- a/init.d/dumpon.in
297 +++ b/init.d/dumpon.in
298 @@ -1,4 +1,4 @@
299 -#!@PREFIX@/sbin/runscript
300 +#!@SBINDIR@/runscript
301 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
302 # Released under the 2-clause BSD license.
303
304
305 diff --git a/init.d/encswap.in b/init.d/encswap.in
306 index bb52735..57cc762 100644
307 --- a/init.d/encswap.in
308 +++ b/init.d/encswap.in
309 @@ -1,4 +1,4 @@
310 -#!@PREFIX@/sbin/runscript
311 +#!@SBINDIR@/runscript
312 # Copyright 1992-2012 FreeBSD Project
313 # Released under the 2-clause BSD license
314
315
316 diff --git a/init.d/fsck.in b/init.d/fsck.in
317 index 8322452..8c460f7 100644
318 --- a/init.d/fsck.in
319 +++ b/init.d/fsck.in
320 @@ -1,4 +1,4 @@
321 -#!@PREFIX@/sbin/runscript
322 +#!@SBINDIR@/runscript
323 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
324 # Released under the 2-clause BSD license.
325
326
327 diff --git a/init.d/hostid.in b/init.d/hostid.in
328 index b682b3d..e98ff91 100644
329 --- a/init.d/hostid.in
330 +++ b/init.d/hostid.in
331 @@ -1,4 +1,4 @@
332 -#!@PREFIX@/sbin/runscript
333 +#!@SBINDIR@/runscript
334 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
335 # Released under the 2-clause BSD license.
336
337
338 diff --git a/init.d/hostname.in b/init.d/hostname.in
339 index 5eea7f0..4374548 100644
340 --- a/init.d/hostname.in
341 +++ b/init.d/hostname.in
342 @@ -1,4 +1,4 @@
343 -#!@PREFIX@/sbin/runscript
344 +#!@SBINDIR@/runscript
345 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
346 # Released under the 2-clause BSD license.
347
348
349 diff --git a/init.d/hwclock.in b/init.d/hwclock.in
350 index eb44f62..0f94993 100644
351 --- a/init.d/hwclock.in
352 +++ b/init.d/hwclock.in
353 @@ -1,4 +1,4 @@
354 -#!@PREFIX@/sbin/runscript
355 +#!@SBINDIR@/runscript
356 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
357 # Released under the 2-clause BSD license.
358
359
360 diff --git a/init.d/ipfw.in b/init.d/ipfw.in
361 index 434920d..a455e29 100644
362 --- a/init.d/ipfw.in
363 +++ b/init.d/ipfw.in
364 @@ -1,4 +1,4 @@
365 -#!@PREFIX@/sbin/runscript
366 +#!@SBINDIR@/runscript
367 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
368 # Released under the 2-clause BSD license.
369
370
371 diff --git a/init.d/keymaps.in b/init.d/keymaps.in
372 index 5889268..7abd731 100644
373 --- a/init.d/keymaps.in
374 +++ b/init.d/keymaps.in
375 @@ -1,4 +1,4 @@
376 -#!@PREFIX@/sbin/runscript
377 +#!@SBINDIR@/runscript
378 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
379 # Released under the 2-clause BSD license.
380
381
382 diff --git a/init.d/killprocs.in b/init.d/killprocs.in
383 index 7f1cf91..5c95925 100644
384 --- a/init.d/killprocs.in
385 +++ b/init.d/killprocs.in
386 @@ -1,4 +1,4 @@
387 -#!@PREFIX@/sbin/runscript
388 +#!@SBINDIR@/runscript
389 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
390 # Released under the 2-clause BSD license.
391
392
393 diff --git a/init.d/local.in b/init.d/local.in
394 index 87cca7d..fb2f9b1 100644
395 --- a/init.d/local.in
396 +++ b/init.d/local.in
397 @@ -1,4 +1,4 @@
398 -#!@PREFIX@/sbin/runscript
399 +#!@SBINDIR@/runscript
400 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
401 # Released under the 2-clause BSD license.
402
403
404 diff --git a/init.d/localmount.in b/init.d/localmount.in
405 index 7d6c305..9cbbd41 100644
406 --- a/init.d/localmount.in
407 +++ b/init.d/localmount.in
408 @@ -1,4 +1,4 @@
409 -#!@PREFIX@/sbin/runscript
410 +#!@SBINDIR@/runscript
411 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
412 # Released under the 2-clause BSD license.
413
414
415 diff --git a/init.d/mixer.in b/init.d/mixer.in
416 index a08aea1..a658e57 100644
417 --- a/init.d/mixer.in
418 +++ b/init.d/mixer.in
419 @@ -1,4 +1,4 @@
420 -#!@PREFIX@/sbin/runscript
421 +#!@SBINDIR@/runscript
422 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
423 # Released under the 2-clause BSD license.
424
425
426 diff --git a/init.d/modules.in b/init.d/modules.in
427 index 72f14e7..0d6d21b 100644
428 --- a/init.d/modules.in
429 +++ b/init.d/modules.in
430 @@ -1,4 +1,4 @@
431 -#!@PREFIX@/sbin/runscript
432 +#!@SBINDIR@/runscript
433 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
434 # Released under the 2-clause BSD license.
435
436
437 diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
438 index 41b0b9e..f8d7258 100644
439 --- a/init.d/mount-ro.in
440 +++ b/init.d/mount-ro.in
441 @@ -1,4 +1,4 @@
442 -#!@PREFIX@/sbin/runscript
443 +#!@SBINDIR@/runscript
444 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
445 # Released under the 2-clause BSD license.
446
447
448 diff --git a/init.d/moused.in b/init.d/moused.in
449 index cdcf36a..ffbed76 100644
450 --- a/init.d/moused.in
451 +++ b/init.d/moused.in
452 @@ -1,4 +1,4 @@
453 -#!@PREFIX@/sbin/runscript
454 +#!@SBINDIR@/runscript
455 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
456 # Released under the 2-clause BSD license.
457
458
459 diff --git a/init.d/mtab.in b/init.d/mtab.in
460 index a32b8d6..beee3e1 100644
461 --- a/init.d/mtab.in
462 +++ b/init.d/mtab.in
463 @@ -1,4 +1,4 @@
464 -#!@PREFIX@/sbin/runscript
465 +#!@SBINDIR@/runscript
466 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
467 # Released under the 2-clause BSD license.
468
469
470 diff --git a/init.d/net.lo.in b/init.d/net.lo.in
471 index b6773fe..95744f8 100644
472 --- a/init.d/net.lo.in
473 +++ b/init.d/net.lo.in
474 @@ -1,4 +1,4 @@
475 -#!@PREFIX@/sbin/runscript
476 +#!@SBINDIR@/runscript
477 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
478 # Released under the 2-clause BSD license.
479
480
481 diff --git a/init.d/netmount.in b/init.d/netmount.in
482 index fd577d5..dbf921b 100644
483 --- a/init.d/netmount.in
484 +++ b/init.d/netmount.in
485 @@ -1,4 +1,4 @@
486 -#!@PREFIX@/sbin/runscript
487 +#!@SBINDIR@/runscript
488 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
489 # Released under the 2-clause BSD license.
490
491
492 diff --git a/init.d/network.in b/init.d/network.in
493 index 13895f0..898b0a8 100644
494 --- a/init.d/network.in
495 +++ b/init.d/network.in
496 @@ -1,4 +1,4 @@
497 -#!@PREFIX@/sbin/runscript
498 +#!@SBINDIR@/runscript
499 # Copyright (c) 2009 Roy Marples <roy@×××××××.name>
500 # Released under the 2-clause BSD license.
501
502
503 diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in
504 index 6cf72e6..1cbbe95 100644
505 --- a/init.d/newsyslog.in
506 +++ b/init.d/newsyslog.in
507 @@ -1,4 +1,4 @@
508 -#!@PREFIX@/sbin/runscript
509 +#!@SBINDIR@/runscript
510 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
511 # Released under the 2-clause BSD license.
512
513
514 diff --git a/init.d/nscd.in b/init.d/nscd.in
515 index 6d3c0c5..41e42ae 100644
516 --- a/init.d/nscd.in
517 +++ b/init.d/nscd.in
518 @@ -1,4 +1,4 @@
519 -#!@PREFIX@/sbin/runscript
520 +#!@SBINDIR@/runscript
521 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
522 # Released under the 2-clause BSD license.
523
524
525 diff --git a/init.d/numlock.in b/init.d/numlock.in
526 index 3cb8bee..433ba93 100644
527 --- a/init.d/numlock.in
528 +++ b/init.d/numlock.in
529 @@ -1,4 +1,4 @@
530 -#!@PREFIX@/sbin/runscript
531 +#!@SBINDIR@/runscript
532 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
533 # Released under the 2-clause BSD license.
534
535
536 diff --git a/init.d/pf.in b/init.d/pf.in
537 index 1097ac8..aed6539 100644
538 --- a/init.d/pf.in
539 +++ b/init.d/pf.in
540 @@ -1,4 +1,4 @@
541 -#!@PREFIX@/sbin/runscript
542 +#!@SBINDIR@/runscript
543 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
544 # Released under the 2-clause BSD license.
545
546
547 diff --git a/init.d/powerd.in b/init.d/powerd.in
548 index 10ffecc..88f050d 100644
549 --- a/init.d/powerd.in
550 +++ b/init.d/powerd.in
551 @@ -1,4 +1,4 @@
552 -#!@PREFIX@/sbin/runscript
553 +#!@SBINDIR@/runscript
554 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
555 # Released under the 2-clause BSD license.
556
557
558 diff --git a/init.d/procfs.in b/init.d/procfs.in
559 index 7b7c6e6..1432ecf 100644
560 --- a/init.d/procfs.in
561 +++ b/init.d/procfs.in
562 @@ -1,4 +1,4 @@
563 -#!@PREFIX@/sbin/runscript
564 +#!@SBINDIR@/runscript
565 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
566 # Released under the 2-clause BSD license.
567
568
569 diff --git a/init.d/rarpd.in b/init.d/rarpd.in
570 index daacb41..8ea29ac 100644
571 --- a/init.d/rarpd.in
572 +++ b/init.d/rarpd.in
573 @@ -1,4 +1,4 @@
574 -#!@PREFIX@/sbin/runscript
575 +#!@SBINDIR@/runscript
576 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
577 # Released under the 2-clause BSD license.
578
579
580 diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in
581 index 9ba73b0..fed30ce 100644
582 --- a/init.d/rc-enabled.in
583 +++ b/init.d/rc-enabled.in
584 @@ -1,4 +1,4 @@
585 -#!@PREFIX@/sbin/runscript
586 +#!@SBINDIR@/runscript
587 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
588 # Released under the 2-clause BSD license.
589
590
591 diff --git a/init.d/root.in b/init.d/root.in
592 index c8ae4f1..387f205 100644
593 --- a/init.d/root.in
594 +++ b/init.d/root.in
595 @@ -1,4 +1,4 @@
596 -#!@PREFIX@/sbin/runscript
597 +#!@SBINDIR@/runscript
598 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
599 # Released under the 2-clause BSD license.
600
601
602 diff --git a/init.d/rpcbind.in b/init.d/rpcbind.in
603 index 7c70871..77d6c87 100644
604 --- a/init.d/rpcbind.in
605 +++ b/init.d/rpcbind.in
606 @@ -1,4 +1,4 @@
607 -#!@PREFIX@/sbin/runscript
608 +#!@SBINDIR@/runscript
609 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
610 # Released under the 2-clause BSD license.
611
612
613 diff --git a/init.d/savecache.in b/init.d/savecache.in
614 index 581be59..3dec78b 100644
615 --- a/init.d/savecache.in
616 +++ b/init.d/savecache.in
617 @@ -1,4 +1,4 @@
618 -#!@PREFIX@/sbin/runscript
619 +#!@SBINDIR@/runscript
620 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
621 # Released under the 2-clause BSD license.
622
623
624 diff --git a/init.d/savecore.in b/init.d/savecore.in
625 index c55a0ab..e256fba 100644
626 --- a/init.d/savecore.in
627 +++ b/init.d/savecore.in
628 @@ -1,4 +1,4 @@
629 -#!@PREFIX@/sbin/runscript
630 +#!@SBINDIR@/runscript
631 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
632 # Released under the 2-clause BSD license.
633
634
635 diff --git a/init.d/staticroute.in b/init.d/staticroute.in
636 index 213dddf..55d0680 100644
637 --- a/init.d/staticroute.in
638 +++ b/init.d/staticroute.in
639 @@ -1,4 +1,4 @@
640 -#!@PREFIX@/sbin/runscript
641 +#!@SBINDIR@/runscript
642 # Copyright (c) 2009 Roy Marples <roy@×××××××.name>
643 # Released under the 2-clause BSD license.
644
645
646 diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in
647 index a7862ee..4ddf61c 100644
648 --- a/init.d/swap-blk.in
649 +++ b/init.d/swap-blk.in
650 @@ -1,4 +1,4 @@
651 -#!@PREFIX@/sbin/runscript
652 +#!@SBINDIR@/runscript
653 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
654 # Released under the 2-clause BSD license.
655
656
657 diff --git a/init.d/swap.in b/init.d/swap.in
658 index fa08b4d..4d7a02c 100644
659 --- a/init.d/swap.in
660 +++ b/init.d/swap.in
661 @@ -1,4 +1,4 @@
662 -#!@PREFIX@/sbin/runscript
663 +#!@SBINDIR@/runscript
664 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
665 # Released under the 2-clause BSD license.
666
667
668 diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
669 index baf7591..ec73baa 100644
670 --- a/init.d/swapfiles.in
671 +++ b/init.d/swapfiles.in
672 @@ -1,4 +1,4 @@
673 -#!@PREFIX@/sbin/runscript
674 +#!@SBINDIR@/runscript
675 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
676 # Released under the 2-clause BSD license.
677
678
679 diff --git a/init.d/swclock.in b/init.d/swclock.in
680 index 077f258..465f76c 100644
681 --- a/init.d/swclock.in
682 +++ b/init.d/swclock.in
683 @@ -1,4 +1,4 @@
684 -#!@PREFIX@/sbin/runscript
685 +#!@SBINDIR@/runscript
686 # Copyright (c) 2009 Roy Marples <roy@×××××××.name>
687 # Released under the 2-clause BSD license.
688
689 @@ -17,7 +17,7 @@ start()
690 {
691 ebegin "Setting the local clock based on last shutdown time"
692 if ! swclock 2> /dev/null; then
693 - swclock --warn @PREFIX@/sbin/runscript
694 + swclock --warn @SBINDIR@/runscript
695 fi
696 eend $?
697 }
698
699 diff --git a/init.d/syscons.in b/init.d/syscons.in
700 index 0666947..6a7523b 100644
701 --- a/init.d/syscons.in
702 +++ b/init.d/syscons.in
703 @@ -1,4 +1,4 @@
704 -#!@PREFIX@/sbin/runscript
705 +#!@SBINDIR@/runscript
706 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
707 # Released under the 2-clause BSD license.
708
709
710 diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in
711 index c7d2028..9f84e36 100644
712 --- a/init.d/sysctl.BSD.in
713 +++ b/init.d/sysctl.BSD.in
714 @@ -1,4 +1,4 @@
715 -#!@PREFIX@/sbin/runscript
716 +#!@SBINDIR@/runscript
717 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
718 # Released under the 2-clause BSD license.
719
720
721 diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
722 index 119f6ee..2413154 100644
723 --- a/init.d/sysctl.Linux.in
724 +++ b/init.d/sysctl.Linux.in
725 @@ -1,4 +1,4 @@
726 -#!@PREFIX@/sbin/runscript
727 +#!@SBINDIR@/runscript
728 # Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name>
729 # Released under the 2-clause BSD license.
730
731
732 diff --git a/init.d/sysfs.in b/init.d/sysfs.in
733 index 85bc083..114a653 100644
734 --- a/init.d/sysfs.in
735 +++ b/init.d/sysfs.in
736 @@ -1,4 +1,4 @@
737 -#!@PREFIX@/sbin/runscript
738 +#!@SBINDIR@/runscript
739 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
740 # Released under the 2-clause BSD license.
741
742
743 diff --git a/init.d/syslogd.in b/init.d/syslogd.in
744 index 817afa1..28090f2 100644
745 --- a/init.d/syslogd.in
746 +++ b/init.d/syslogd.in
747 @@ -1,4 +1,4 @@
748 -#!@PREFIX@/sbin/runscript
749 +#!@SBINDIR@/runscript
750 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
751 # Released under the 2-clause BSD license.
752
753
754 diff --git a/init.d/termencoding.in b/init.d/termencoding.in
755 index a8a96e5..d03633d 100644
756 --- a/init.d/termencoding.in
757 +++ b/init.d/termencoding.in
758 @@ -1,4 +1,4 @@
759 -#!@PREFIX@/sbin/runscript
760 +#!@SBINDIR@/runscript
761 # Copyright (c) 2008-2009 Roy Marples <roy@×××××××.name>
762 # Released under the 2-clause BSD license.
763
764
765 diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in
766 index a3ecd31..81bc369 100644
767 --- a/init.d/tmpfiles.setup.in
768 +++ b/init.d/tmpfiles.setup.in
769 @@ -1,4 +1,4 @@
770 -#!@PREFIX@/sbin/runscript
771 +#!@SBINDIR@/runscript
772 # Copyright 1999-2012 Gentoo Foundation
773 # Released under the 2-clause BSD license.
774
775
776 diff --git a/init.d/ttys.in b/init.d/ttys.in
777 index 2adbe81..aec8340 100644
778 --- a/init.d/ttys.in
779 +++ b/init.d/ttys.in
780 @@ -1,4 +1,4 @@
781 -#!@PREFIX@/sbin/runscript
782 +#!@SBINDIR@/runscript
783 # Copyright (c) 2008 Roy Marples <roy@×××××××.name>
784 # Released under the 2-clause BSD license.
785
786
787 diff --git a/init.d/urandom.in b/init.d/urandom.in
788 index 2dfe1cc..97d0407 100644
789 --- a/init.d/urandom.in
790 +++ b/init.d/urandom.in
791 @@ -1,4 +1,4 @@
792 -#!@PREFIX@/sbin/runscript
793 +#!@SBINDIR@/runscript
794 # Copyright (c) 2007-2009 Roy Marples <roy@×××××××.name>
795 # Released under the 2-clause BSD license.
796
797
798 diff --git a/init.d/wscons.in b/init.d/wscons.in
799 index 5d94eff..35bd2b0 100644
800 --- a/init.d/wscons.in
801 +++ b/init.d/wscons.in
802 @@ -1,4 +1,4 @@
803 -#!@PREFIX@/sbin/runscript
804 +#!@SBINDIR@/runscript
805 # Copyright (c) 2008-2009 Roy Marples <roy@×××××××.name>
806 # Released under the 2-clause BSD license.
807
808
809 diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in
810 index f78f3d3..461c688 100644
811 --- a/sh/gendepends.sh.in
812 +++ b/sh/gendepends.sh.in
813 @@ -53,8 +53,8 @@ do
814
815 # Only generate dependencies for runscripts
816 read one two three <"$RC_SERVICE"
817 - [ "$one" = "#!@PREFIX@/sbin/runscript" ] || \
818 - [ "$one" = "#!" -a "$two" = "@PREFIX@/sbin/runscript" ] || \
819 + [ "$one" = "#!@SBINDIR@/runscript" ] || \
820 + [ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
821 continue
822 unset one two three