diff options
79 files changed, 103 insertions, 85 deletions
@@ -61,10 +61,13 @@ As of OpenRC-0.12, the net.* scripts, originally from Gentoo Linux, have been removed. If you need these scripts, look for a package called netifrc, which is maintained by them. -As of OpenRC-0.13, the /sbin/rc binary has been renamed /sbin/openrc. -There is a /sbin/rc symbolic link in place currently in case you are -still using the old name. However, it is strongly advised that you -migrate your system to the new name. +As of OpenRC-0.13, two binaries have been renamed due to naming +conflicts with other software. The /sbin/rc binary was renamed to +/sbin/openrc, and /sbin/runscript was renamed to /sbin/openrc-run. + +Backward compatible symbolic links are currently in place so your +system will keep working if you are using the old names; however, it is +strongly advised that you migrate to the new names. Reporting Bugs -------------- diff --git a/init.d.misc/avahi-dnsconfd.in b/init.d.misc/avahi-dnsconfd.in index abe2d228..5e022a1b 100644 --- a/init.d.misc/avahi-dnsconfd.in +++ b/init.d.misc/avahi-dnsconfd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in index ea2241bb..bc8ce15b 100644 --- a/init.d.misc/avahid.in +++ b/init.d.misc/avahid.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in index d0004e71..52598534 100644 --- a/init.d.misc/dbus.in +++ b/init.d.misc/dbus.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/dhcpcd.in b/init.d.misc/dhcpcd.in index b22d4d1b..ff71979f 100644 --- a/init.d.misc/dhcpcd.in +++ b/init.d.misc/dhcpcd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in index bdb04118..fa57164b 100644 --- a/init.d.misc/dnsmasq.in +++ b/init.d.misc/dnsmasq.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/hald.in b/init.d.misc/hald.in index 741442f6..eb7ce06d 100644 --- a/init.d.misc/hald.in +++ b/init.d.misc/hald.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/named.in b/init.d.misc/named.in index 924f5b5a..3f558849 100644 --- a/init.d.misc/named.in +++ b/init.d.misc/named.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in index 6f185212..080ce2f6 100644 --- a/init.d.misc/ntpd.in +++ b/init.d.misc/ntpd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in index 699fc046..32379466 100644 --- a/init.d.misc/openvpn.in +++ b/init.d.misc/openvpn.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/polkitd.in b/init.d.misc/polkitd.in index fda07648..829e93b3 100644 --- a/init.d.misc/polkitd.in +++ b/init.d.misc/polkitd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/sshd.in b/init.d.misc/sshd.in index 7efb666b..ae51505f 100644 --- a/init.d.misc/sshd.in +++ b/init.d.misc/sshd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d.misc/wpa_supplicant.in b/init.d.misc/wpa_supplicant.in index f908e364..d9246123 100644 --- a/init.d.misc/wpa_supplicant.in +++ b/init.d.misc/wpa_supplicant.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in index d1349c88..93a200bf 100644 --- a/init.d/adjkerntz.in +++ b/init.d/adjkerntz.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in index 72202f02..ca333bec 100644 --- a/init.d/bootmisc.in +++ b/init.d/bootmisc.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/consolefont.in b/init.d/consolefont.in index 61e76c3c..7ec93d66 100644 --- a/init.d/consolefont.in +++ b/init.d/consolefont.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/devd.in b/init.d/devd.in index 395dfa73..d071911c 100644 --- a/init.d/devd.in +++ b/init.d/devd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/devdb.in b/init.d/devdb.in index 92137589..3cc08a59 100644 --- a/init.d/devdb.in +++ b/init.d/devdb.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/devfs.in b/init.d/devfs.in index afc2cb7b..5c167b02 100644 --- a/init.d/devfs.in +++ b/init.d/devfs.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/dmesg.in b/init.d/dmesg.in index 1c72f76a..5b001fca 100644 --- a/init.d/dmesg.in +++ b/init.d/dmesg.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/dumpon.in b/init.d/dumpon.in index fdbdd49c..1e23076b 100644 --- a/init.d/dumpon.in +++ b/init.d/dumpon.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/encswap.in b/init.d/encswap.in index 57cc7629..3df4a356 100644 --- a/init.d/encswap.in +++ b/init.d/encswap.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright 1992-2012 FreeBSD Project # Released under the 2-clause BSD license diff --git a/init.d/fsck.in b/init.d/fsck.in index 9db51198..d3b66078 100644 --- a/init.d/fsck.in +++ b/init.d/fsck.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/hostid.in b/init.d/hostid.in index ce5574b5..4495ddf6 100644 --- a/init.d/hostid.in +++ b/init.d/hostid.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/hostname.in b/init.d/hostname.in index 43745488..eaeb79aa 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/hwclock.in b/init.d/hwclock.in index 0f949936..823a5ab2 100644 --- a/init.d/hwclock.in +++ b/init.d/hwclock.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/ipfw.in b/init.d/ipfw.in index cb9b6df7..df30f3b3 100644 --- a/init.d/ipfw.in +++ b/init.d/ipfw.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/keymaps.in b/init.d/keymaps.in index 7abd7314..eeed22a2 100644 --- a/init.d/keymaps.in +++ b/init.d/keymaps.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/killprocs.in b/init.d/killprocs.in index 5c959255..5cd4fc47 100644 --- a/init.d/killprocs.in +++ b/init.d/killprocs.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/local.in b/init.d/local.in index e82d3ccf..2f205680 100644 --- a/init.d/local.in +++ b/init.d/local.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/localmount.in b/init.d/localmount.in index 42b79883..bf3dd0fb 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/loopback.in b/init.d/loopback.in index 6267ec48..ec45a98c 100644 --- a/init.d/loopback.in +++ b/init.d/loopback.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com> # Released under the 2-clause BSD license. diff --git a/init.d/mixer.in b/init.d/mixer.in index a658e577..8bf152b1 100644 --- a/init.d/mixer.in +++ b/init.d/mixer.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/modules.in b/init.d/modules.in index 0d6d21bf..acce97e3 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index 3e093522..a6438b58 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/moused.in b/init.d/moused.in index ffbed767..2b63a346 100644 --- a/init.d/moused.in +++ b/init.d/moused.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/mtab.in b/init.d/mtab.in index beee3e10..8e5bc2fb 100644 --- a/init.d/mtab.in +++ b/init.d/mtab.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/netmount.in b/init.d/netmount.in index 86cdcba3..39ab0bca 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/network.in b/init.d/network.in index 17237d33..2e9b8974 100644 --- a/init.d/network.in +++ b/init.d/network.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in index 1cbbe952..894b0c07 100644 --- a/init.d/newsyslog.in +++ b/init.d/newsyslog.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/nscd.in b/init.d/nscd.in index 41e42ae7..670f2066 100644 --- a/init.d/nscd.in +++ b/init.d/nscd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/numlock.in b/init.d/numlock.in index 433ba93e..1b6d0a59 100644 --- a/init.d/numlock.in +++ b/init.d/numlock.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/pf.in b/init.d/pf.in index a8b301d9..f4344a93 100644 --- a/init.d/pf.in +++ b/init.d/pf.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/powerd.in b/init.d/powerd.in index 88f050d4..36d60a7e 100644 --- a/init.d/powerd.in +++ b/init.d/powerd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/procfs.in b/init.d/procfs.in index 1432ecff..0db53051 100644 --- a/init.d/procfs.in +++ b/init.d/procfs.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/rarpd.in b/init.d/rarpd.in index 8ea29acc..e11de6d2 100644 --- a/init.d/rarpd.in +++ b/init.d/rarpd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in index fed30ce6..50587bce 100644 --- a/init.d/rc-enabled.in +++ b/init.d/rc-enabled.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/root.in b/init.d/root.in index 387f205c..1668368c 100644 --- a/init.d/root.in +++ b/init.d/root.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/rpcbind.in b/init.d/rpcbind.in index 77d6c87c..c10deeb1 100644 --- a/init.d/rpcbind.in +++ b/init.d/rpcbind.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/savecache.in b/init.d/savecache.in index 3dec78b5..9040732c 100644 --- a/init.d/savecache.in +++ b/init.d/savecache.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/savecore.in b/init.d/savecore.in index e256fbaf..b1b6ca37 100644 --- a/init.d/savecore.in +++ b/init.d/savecore.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/staticroute.in b/init.d/staticroute.in index 55d0680e..34214e0f 100644 --- a/init.d/staticroute.in +++ b/init.d/staticroute.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in index 4ddf61c4..5a140834 100644 --- a/init.d/swap-blk.in +++ b/init.d/swap-blk.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/swap.in b/init.d/swap.in index 4d7a02cf..a64ea608 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in index 144096a8..1c805004 100644 --- a/init.d/swapfiles.in +++ b/init.d/swapfiles.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/swclock.in b/init.d/swclock.in index 465f76cf..b74d49a1 100644 --- a/init.d/swclock.in +++ b/init.d/swclock.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. @@ -17,7 +17,7 @@ start() { ebegin "Setting the local clock based on last shutdown time" if ! swclock 2> /dev/null; then - swclock --warn @SBINDIR@/runscript + swclock --warn @SBINDIR@/openrc-run fi eend $? } diff --git a/init.d/syscons.in b/init.d/syscons.in index 6a7523b2..ce0b5a13 100644 --- a/init.d/syscons.in +++ b/init.d/syscons.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in index 9f84e36f..92d58680 100644 --- a/init.d/sysctl.BSD.in +++ b/init.d/sysctl.BSD.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in index 2413154d..1ebce660 100644 --- a/init.d/sysctl.Linux.in +++ b/init.d/sysctl.Linux.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 7658cb5f..1dba73f9 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/syslogd.in b/init.d/syslogd.in index 28090f29..953742bf 100644 --- a/init.d/syslogd.in +++ b/init.d/syslogd.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/termencoding.in b/init.d/termencoding.in index d03633d3..d3aa0278 100644 --- a/init.d/termencoding.in +++ b/init.d/termencoding.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2008-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/tmpfiles.dev.in b/init.d/tmpfiles.dev.in index 477fafa6..c2de59f4 100644 --- a/init.d/tmpfiles.dev.in +++ b/init.d/tmpfiles.dev.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright 1999-2012 Gentoo Foundation # Released under the 2-clause BSD license. diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in index fd9b0154..7edef5ac 100644 --- a/init.d/tmpfiles.setup.in +++ b/init.d/tmpfiles.setup.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright 1999-2012 Gentoo Foundation # Released under the 2-clause BSD license. diff --git a/init.d/ttys.in b/init.d/ttys.in index aec83408..8fdd1696 100644 --- a/init.d/ttys.in +++ b/init.d/ttys.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/urandom.in b/init.d/urandom.in index 97d04077..ded41137 100644 --- a/init.d/urandom.in +++ b/init.d/urandom.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2007-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/init.d/wscons.in b/init.d/wscons.in index 35bd2b01..84671224 100644 --- a/init.d/wscons.in +++ b/init.d/wscons.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/runscript +#!@SBINDIR@/openrc-run # Copyright (c) 2008-2009 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. diff --git a/man/Makefile b/man/Makefile index 04862da2..436f647d 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,7 +1,7 @@ MAN3= einfo.3 \ rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \ rc_runlevel.3 rc_service.3 rc_stringlist.3 -MAN8= rc-service.8 rc-status.8 rc-update.8 openrc.8 runscript.8 \ +MAN8= rc-service.8 rc-status.8 rc-update.8 openrc.8 openrc-run.8 \ service.8 start-stop-daemon.8 # Handy macro to create symlinks diff --git a/man/runscript.8 b/man/openrc-run.8 index e0d7cf02..03462414 100644 --- a/man/runscript.8 +++ b/man/openrc-run.8 @@ -22,10 +22,10 @@ .\" SUCH DAMAGE. .\" .Dd December 31, 2011 -.Dt RUNSCRIPT 8 SMM +.Dt openrc-run 8 SMM .Os OpenRC .Sh NAME -.Nm runscript +.Nm openrc-run .Nd a means of hooking shell commands into a service .Sh SYNOPSIS .Nm @@ -47,7 +47,7 @@ and finally the script itself. At this point then runs the command given. .Pp Commands are defined as shell functions within the script. Here is a list of -some functions that all runscripts have by default: +some functions that all scripts have by default: .Bl -tag -width "RC_DEFAULTLEVEL" .It Ar describe Describes what the service does and each command the service defines. @@ -411,7 +411,7 @@ rc_keyword="!-prefix" .Pp An example service script for foo. .Bd -literal -offset indent -#!/sbin/runscript +#!/sbin/openrc-run command=/usr/bin/foo command_args="${foo_args} --bar" pidfile=/var/run/foo.pid diff --git a/man/rc-update.8 b/man/rc-update.8 index 459f0693..3fa97a4e 100644 --- a/man/rc-update.8 +++ b/man/rc-update.8 @@ -53,7 +53,8 @@ All services must reside in the or .Pa /usr/local/etc/init.d directories. -They must also conform to the OpenRC runscript standard. +They must also be standard OpenRC scripts, meaning they must use +openrc-run. .Pp .Bl -tag -width "Fl a , -delete service" .It Ar add Ar service @@ -87,6 +88,7 @@ option is given then we either add or remove the runlevel from the runlevel. This allows inheritance of runlevels. .Sh SEE ALSO .Xr openrc 8 , +.Xr openrc-run 8 , .Xr rc-status 8 .Sh AUTHORS .An Roy Marples <roy@marples.name> diff --git a/man/rc_deptree.3 b/man/rc_deptree.3 index e9805343..64fcf602 100644 --- a/man/rc_deptree.3 +++ b/man/rc_deptree.3 @@ -107,6 +107,6 @@ when done. .Xr malloc 3 , .Xr free 3 , .Xr rc_stringlist_free 3 , -.Xr runscript 8 +.Xr openrc-run 8 .Sh AUTHORS .An Roy Marples <roy@marples.name> diff --git a/man/rc_plugin_hook.3 b/man/rc_plugin_hook.3 index 22a1c589..955ecb8c 100644 --- a/man/rc_plugin_hook.3 +++ b/man/rc_plugin_hook.3 @@ -45,6 +45,6 @@ Plugins can affect the parent environment by writing NULL separated strings to .Va rc_environ_fd . .Sh SEE ALSO .Xr openrc 8 , -.Xr runscript 8 +.Xr openrc-run 8 .Sh AUTHORS .An Roy Marples <roy@marples.name> diff --git a/man/rc_service.3 b/man/rc_service.3 index 4c1ee011..aba1636b 100644 --- a/man/rc_service.3 +++ b/man/rc_service.3 @@ -141,7 +141,7 @@ is lost. returns a list of extra commands the .Fa service supports beyond the default ones. See -.Nm runscript +.Nm openrc-run for default commands. .Pp .Fn rc_service_plugable diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in index 461c6882..dfe7444b 100644 --- a/sh/gendepends.sh.in +++ b/sh/gendepends.sh.in @@ -51,10 +51,12 @@ do for RC_SERVICE in *; do [ -x "$RC_SERVICE" -a -f "$RC_SERVICE" ] || continue - # Only generate dependencies for runscripts + # Only generate dependencies for OpenRC scripts read one two three <"$RC_SERVICE" [ "$one" = "#!@SBINDIR@/runscript" ] || \ + [ "$one" = "#!@SBINDIR@/openrc-run" ] || \ [ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \ + [ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \ continue unset one two three diff --git a/src/rc/.gitignore b/src/rc/.gitignore index e04e2f35..bbfede6a 100644 --- a/src/rc/.gitignore +++ b/src/rc/.gitignore @@ -58,3 +58,4 @@ mark_service_failed rc-abort rc openrc +openrc-run diff --git a/src/rc/Makefile b/src/rc/Makefile index 209523ab..5f5aa631 100644 --- a/src/rc/Makefile +++ b/src/rc/Makefile @@ -11,7 +11,8 @@ SBINDIR= ${PREFIX}/sbin LINKDIR= ${LIBEXECDIR} BINLINKS= rc-status -SBINLINKS= rc rc-service rc-update runscript service start-stop-daemon +SBINLINKS= rc rc-service rc-update openrc-run runscript service \ + start-stop-daemon RC_BINLINKS= einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \ eindent eoutdent esyslog eval_ecolors ewaitfile \ veinfo vewarn vebegin veend vewend veindent veoutdent \ diff --git a/src/rc/builtins.h b/src/rc/builtins.h index 22bd0f20..2b38c675 100644 --- a/src/rc/builtins.h +++ b/src/rc/builtins.h @@ -28,6 +28,7 @@ int checkpath(int, char **); int fstabinfo(int, char **); int mountinfo(int, char **); +int openrc_run(int, char **); int rc_depend(int, char **); int rc_service(int, char **); int rc_status(int, char **); diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c index 8431eea3..b4f61d9f 100644 --- a/src/rc/rc-applets.c +++ b/src/rc/rc-applets.c @@ -503,6 +503,7 @@ static const struct { #define A(a) { #a, a } A(fstabinfo), A(mountinfo), + { "openrc-run", openrc_run, }, { "rc-depend", rc_depend, }, { "rc-service", rc_service, }, { "rc-status", rc_status, }, diff --git a/src/rc/runscript.c b/src/rc/runscript.c index e5cb62e8..981e6067 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -1116,7 +1116,7 @@ static const char *const longopts_help[] = { #include "_usage.c" int -runscript(int argc, char **argv) +openrc_run(int argc, char **argv) { bool doneone = false; int retval, opt, depoptions = RC_DEP_TRACE; @@ -1130,12 +1130,12 @@ runscript(int argc, char **argv) /* Show help if insufficient args */ if (argc < 2 || !exists(argv[1])) { - fprintf(stderr, "runscript should not be run directly\n"); + fprintf(stderr, "openrc-run should not be run directly\n"); exit(EXIT_FAILURE); } if (stat(argv[1], &stbuf) != 0) { - fprintf(stderr, "runscript `%s': %s\n", + fprintf(stderr, "openrc-run `%s': %s\n", argv[1], strerror(errno)); exit(EXIT_FAILURE); } @@ -1420,3 +1420,10 @@ runscript(int argc, char **argv) return retval; } + +int +runscript(int argc, char **argv) +{ + ewarn("runscript is deprecated; please use openrc-run instead."); + return (openrc_run(argc, argv)); +} |