[gentoo-commits] proj/openrc:master commit in: man/, init.d/, /, sh/, src/rc/, init.d.misc/

[William Hubbs]

commit:     3470eda3f5cea437a6de132b1ead3f27effd3902
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Dec 21 20:51:11 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 04:57:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3470eda3

Rename runscript to openrc-run

This was requested by Debian, because the minicom software, which is
available on Debian and other distros, has a binary named runscript. We
are keeping a backward compatibility symlink for now, but this allows
Debian or any other distro to safely remove the symlink.

X-Gentoo-Bug: 494220
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=494220

---
 README                            | 11 +++++++----
 init.d.misc/avahi-dnsconfd.in     |  2 +-
 init.d.misc/avahid.in             |  2 +-
 init.d.misc/dbus.in               |  2 +-
 init.d.misc/dhcpcd.in             |  2 +-
 init.d.misc/dnsmasq.in            |  2 +-
 init.d.misc/hald.in               |  2 +-
 init.d.misc/named.in              |  2 +-
 init.d.misc/ntpd.in               |  2 +-
 init.d.misc/openvpn.in            |  2 +-
 init.d.misc/polkitd.in            |  2 +-
 init.d.misc/sshd.in               |  2 +-
 init.d.misc/wpa_supplicant.in     |  2 +-
 init.d/adjkerntz.in               |  2 +-
 init.d/bootmisc.in                |  2 +-
 init.d/consolefont.in             |  2 +-
 init.d/devd.in                    |  2 +-
 init.d/devdb.in                   |  2 +-
 init.d/devfs.in                   |  2 +-
 init.d/dmesg.in                   |  2 +-
 init.d/dumpon.in                  |  2 +-
 init.d/encswap.in                 |  2 +-
 init.d/fsck.in                    |  2 +-
 init.d/hostid.in                  |  2 +-
 init.d/hostname.in                |  2 +-
 init.d/hwclock.in                 |  2 +-
 init.d/ipfw.in                    |  2 +-
 init.d/keymaps.in                 |  2 +-
 init.d/killprocs.in               |  2 +-
 init.d/local.in                   |  2 +-
 init.d/localmount.in              |  2 +-
 init.d/loopback.in                |  2 +-
 init.d/mixer.in                   |  2 +-
 init.d/modules.in                 |  2 +-
 init.d/mount-ro.in                |  2 +-
 init.d/moused.in                  |  2 +-
 init.d/mtab.in                    |  2 +-
 init.d/netmount.in                |  2 +-
 init.d/network.in                 |  2 +-
 init.d/newsyslog.in               |  2 +-
 init.d/nscd.in                    |  2 +-
 init.d/numlock.in                 |  2 +-
 init.d/pf.in                      |  2 +-
 init.d/powerd.in                  |  2 +-
 init.d/procfs.in                  |  2 +-
 init.d/rarpd.in                   |  2 +-
 init.d/rc-enabled.in              |  2 +-
 init.d/root.in                    |  2 +-
 init.d/rpcbind.in                 |  2 +-
 init.d/savecache.in               |  2 +-
 init.d/savecore.in                |  2 +-
 init.d/staticroute.in             |  2 +-
 init.d/swap-blk.in                |  2 +-
 init.d/swap.in                    |  2 +-
 init.d/swapfiles.in               |  2 +-
 init.d/swclock.in                 |  4 ++--
 init.d/syscons.in                 |  2 +-
 init.d/sysctl.BSD.in              |  2 +-
 init.d/sysctl.Linux.in            |  2 +-
 init.d/sysfs.in                   |  2 +-
 init.d/syslogd.in                 |  2 +-
 init.d/termencoding.in            |  2 +-
 init.d/tmpfiles.dev.in            |  2 +-
 init.d/tmpfiles.setup.in          |  2 +-
 init.d/ttys.in                    |  2 +-
 init.d/urandom.in                 |  2 +-
 init.d/wscons.in                  |  2 +-
 man/Makefile                      |  2 +-
 man/{runscript.8 => openrc-run.8} |  8 ++++----
 man/rc-update.8                   |  4 +++-
 man/rc_deptree.3                  |  2 +-
 man/rc_plugin_hook.3              |  2 +-
 man/rc_service.3                  |  2 +-
 sh/gendepends.sh.in               |  4 +++-
 src/rc/.gitignore                 |  1 +
 src/rc/Makefile                   |  3 ++-
 src/rc/builtins.h                 |  1 +
 src/rc/rc-applets.c               |  1 +
 src/rc/runscript.c                | 13 ++++++++++---
 79 files changed, 103 insertions(+), 85 deletions(-)

diff --git a/README b/README
index 53408c3..798ef4e 100644
--- a/README
+++ b/README
@@ -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 abe2d22..5e022a1 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in
index ea2241b..bc8ce15 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
index d0004e7..5259853 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/dhcpcd.in b/init.d.misc/dhcpcd.in
index b22d4d1..ff71979 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in
index bdb0411..fa57164 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/hald.in b/init.d.misc/hald.in
index 741442f..eb7ce06 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/named.in b/init.d.misc/named.in
index 924f5b5..3f55884 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in
index 6f18521..080ce2f 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
index 699fc04..3237946 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/polkitd.in b/init.d.misc/polkitd.in
index fda0764..829e93b 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d.misc/sshd.in b/init.d.misc/sshd.in
index 7efb666..ae51505 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@×××××××.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 f908e36..d924612 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in
index d1349c8..93a200b 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 72202f0..ca333be 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 61e76c3..7ec93d6 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/devd.in b/init.d/devd.in
index 395dfa7..d071911 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/devdb.in b/init.d/devdb.in
index 9213758..3cc08a5 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/devfs.in b/init.d/devfs.in
index afc2cb7..5c167b0 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index 1c72f76..5b001fc 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/dumpon.in b/init.d/dumpon.in
index fdbdd49..1e23076 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/encswap.in b/init.d/encswap.in
index 57cc762..3df4a35 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 9db5119..d3b6607 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/hostid.in b/init.d/hostid.in
index ce5574b..4495ddf 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/hostname.in b/init.d/hostname.in
index 4374548..eaeb79a 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 0f94993..823a5ab 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/ipfw.in b/init.d/ipfw.in
index cb9b6df..df30f3b 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index 7abd731..eeed22a 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/killprocs.in b/init.d/killprocs.in
index 5c95925..5cd4fc4 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/local.in b/init.d/local.in
index e82d3cc..2f20568 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 42b7988..bf3dd0f 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/loopback.in b/init.d/loopback.in
index 6267ec4..ec45a98 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@×××××.com>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/mixer.in b/init.d/mixer.in
index a658e57..8bf152b 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/modules.in b/init.d/modules.in
index 0d6d21b..acce97e 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 3e09352..a6438b5 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/moused.in b/init.d/moused.in
index ffbed76..2b63a34 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/mtab.in b/init.d/mtab.in
index beee3e1..8e5bc2f 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 86cdcba..39ab0bc 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/network.in b/init.d/network.in
index 17237d3..2e9b897 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in
index 1cbbe95..894b0c0 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/nscd.in b/init.d/nscd.in
index 41e42ae..670f206 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/numlock.in b/init.d/numlock.in
index 433ba93..1b6d0a5 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/pf.in b/init.d/pf.in
index a8b301d..f4344a9 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/powerd.in b/init.d/powerd.in
index 88f050d..36d60a7 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 1432ecf..0db5305 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/rarpd.in b/init.d/rarpd.in
index 8ea29ac..e11de6d 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in
index fed30ce..50587bc 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/root.in b/init.d/root.in
index 387f205..1668368 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/rpcbind.in b/init.d/rpcbind.in
index 77d6c87..c10deeb 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/savecache.in b/init.d/savecache.in
index 3dec78b..9040732 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/savecore.in b/init.d/savecore.in
index e256fba..b1b6ca3 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index 55d0680..34214e0 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in
index 4ddf61c..5a14083 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/swap.in b/init.d/swap.in
index 4d7a02c..a64ea60 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index 144096a..1c80500 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/swclock.in b/init.d/swclock.in
index 465f76c..b74d49a 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@×××××××.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 6a7523b..ce0b5a1 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in
index 9f84e36..92d5868 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 2413154..1ebce66 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 7658cb5..1dba73f 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/syslogd.in b/init.d/syslogd.in
index 28090f2..953742b 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index d03633d..d3aa027 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/tmpfiles.dev.in b/init.d/tmpfiles.dev.in
index 477fafa..c2de59f 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 fd9b015..7edef5a 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 aec8340..8fdd169 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/urandom.in b/init.d/urandom.in
index 97d0407..ded4113 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/init.d/wscons.in b/init.d/wscons.in
index 35bd2b0..8467122 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@×××××××.name>
 # Released under the 2-clause BSD license.
 

diff --git a/man/Makefile b/man/Makefile
index 04862da..436f647 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
similarity index 99%
rename from man/runscript.8
rename to man/openrc-run.8
index e0d7cf0..0346241 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 459f069..3fa97a4 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@×××××××.name>

diff --git a/man/rc_deptree.3 b/man/rc_deptree.3
index e980534..64fcf60 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@×××××××.name>

diff --git a/man/rc_plugin_hook.3 b/man/rc_plugin_hook.3
index 22a1c58..955ecb8 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@×××××××.name>

diff --git a/man/rc_service.3 b/man/rc_service.3
index 4c1ee01..aba1636 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 461c688..dfe7444 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 e04e2f3..bbfede6 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 209523a..5f5aa63 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 22bd0f2..2b38c67 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 8431eea..b4f61d9 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 e5cb62e..981e606 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));
+}