commit: 7affff568a0aa83d732757c4699d4b94b7e3a9aa
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Dec 20 17:01:29 2017 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 17:01:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=7affff56
init.d.examples: pid files always go in /var
This removes the @VARBASE@ substitution since it is always translated to
/var.
support/init.d.examples/Makefile | 2 --
support/init.d.examples/avahi-dnsconfd.in | 2 +-
support/init.d.examples/avahid.in | 2 +-
support/init.d.examples/dbus.in | 2 +-
support/init.d.examples/dnsmasq.in | 2 +-
support/init.d.examples/hald.in | 2 +-
support/init.d.examples/named.in | 4 ++--
support/init.d.examples/openvpn.in | 2 +-
support/init.d.examples/polkitd.in | 2 +-
support/init.d.examples/sshd.in | 2 +-
10 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/support/init.d.examples/Makefile b/support/init.d.examples/Makefile
index b65c1fd4..0c043251 100644
--- a/support/init.d.examples/Makefile
+++ b/support/init.d.examples/Makefile
@@ -7,7 +7,5 @@ BIN= ${OBJS}
MK= ../../mk
-SED_EXTRA+= -e 's:@VARBASE@:/var:g'
-
include ${MK}/os.mk
include ${MK}/scripts.mk
diff --git a/support/init.d.examples/avahi-dnsconfd.in
b/support/init.d.examples/avahi-dnsconfd.in
index b87b6d58..6e117883 100644
--- a/support/init.d.examples/avahi-dnsconfd.in
+++ b/support/init.d.examples/avahi-dnsconfd.in
@@ -11,7 +11,7 @@
command=@PKG_PREFIX@/sbin/avahi-dnsconfd
command_args="$avahi_dnsconfd_args -D"
-pidfile=@VARBASE@/run/avahi-dnsconfd.pid
+pidfile=/var/run/avahi-dnsconfd.pid
name="Avahi DNS Configuration Daemon"
depend()
diff --git a/support/init.d.examples/avahid.in
b/support/init.d.examples/avahid.in
index b809d7b0..9953bd79 100644
--- a/support/init.d.examples/avahid.in
+++ b/support/init.d.examples/avahid.in
@@ -11,7 +11,7 @@
command=@PKG_PREFIX@/sbin/avahi-daemon
command_args="$avahid_args -D"
-pidfile=@VARBASE@/run/avahi-daemon/pid
+pidfile=/var/run/avahi-daemon/pid
name="Avahi Service Advertisement Daemon"
depend()
diff --git a/support/init.d.examples/dbus.in b/support/init.d.examples/dbus.in
index 0275767d..52ee9113 100644
--- a/support/init.d.examples/dbus.in
+++ b/support/init.d.examples/dbus.in
@@ -10,7 +10,7 @@
# except according to the terms contained in the LICENSE file.
command=@PKG_PREFIX@/bin/dbus-daemon
-pidfile=@VARBASE@/run/dbus/pid
+pidfile=/var/run/dbus/pid
command_args="${dbusd_args---system}"
name="Message Bus Daemon"
diff --git a/support/init.d.examples/dnsmasq.in
b/support/init.d.examples/dnsmasq.in
index f711b2e3..52f2b945 100644
--- a/support/init.d.examples/dnsmasq.in
+++ b/support/init.d.examples/dnsmasq.in
@@ -11,7 +11,7 @@
command=@PKG_PREFIX@/sbin/dnsmasq
command_args=$dnsmasq_args
-pidfile=@VARBASE@/run/dnsmasq.pid
+pidfile=/var/run/dnsmasq.pid
required_files=/etc/dnsmasq.conf
extra_started_commands="reload"
diff --git a/support/init.d.examples/hald.in b/support/init.d.examples/hald.in
index bde173c2..84dbb401 100644
--- a/support/init.d.examples/hald.in
+++ b/support/init.d.examples/hald.in
@@ -10,7 +10,7 @@
# except according to the terms contained in the LICENSE file.
command=@PKG_PREFIX@/sbin/hald
-pidfile=@VARBASE@/run/hald/hald.pid
+pidfile=/var/run/hald/hald.pid
command_args=$hald_args
name="Hardware Abstraction Layer Daemon"
diff --git a/support/init.d.examples/named.in b/support/init.d.examples/named.in
index 1348787f..409ac54e 100644
--- a/support/init.d.examples/named.in
+++ b/support/init.d.examples/named.in
@@ -11,7 +11,7 @@
command=/usr/sbin/named
command_args=$named_args
-pidfile=@VARBASE@/run/named.pid
+pidfile=/var/run/named.pid
name="Domain Name server"
extra_started_commands="reload"
@@ -20,7 +20,7 @@ uid=named
case "$RC_UNAME" in
FreeBSD)
uid=bind
- pidfile=@VARBASE@/run/named/pid
+ pidfile=/var/run/named/pid
;;
Linux)
uid=bind
diff --git a/support/init.d.examples/openvpn.in
b/support/init.d.examples/openvpn.in
index 95e94821..1608228e 100644
--- a/support/init.d.examples/openvpn.in
+++ b/support/init.d.examples/openvpn.in
@@ -14,7 +14,7 @@ name="OpenVPN"
[ "$vpn" != openvpn ] && name="$name ($vpn)"
command=@PKG_PREFIX@/sbin/openvpn
-pidfile=@VARBASE@/run/"$RC_SVCNAME".pid
+pidfile=/var/run/"$RC_SVCNAME".pid
: ${openvpn_dir:=@PKG_PREFIX@/etc/openvpn}
: ${openvpn_config:=$openvpn_dir/$vpn.conf}
command_args="$openvpn_args --daemon --config $openvpn_config"
diff --git a/support/init.d.examples/polkitd.in
b/support/init.d.examples/polkitd.in
index a36e3395..b1292385 100644
--- a/support/init.d.examples/polkitd.in
+++ b/support/init.d.examples/polkitd.in
@@ -10,7 +10,7 @@
# except according to the terms contained in the LICENSE file.
command=@PKG_PREFIX@/sbin/polkitd
-pidfile=@VARBASE@/run/polkitd/polkitd.pid
+pidfile=/var/run/polkitd/polkitd.pid
command_args="$polkitd_args"
name="PolicyKit Daemon"
diff --git a/support/init.d.examples/sshd.in b/support/init.d.examples/sshd.in
index d89224d3..db7fec90 100644
--- a/support/init.d.examples/sshd.in
+++ b/support/init.d.examples/sshd.in
@@ -11,7 +11,7 @@
command=/usr/sbin/sshd
command_args=$sshd_args
-pidfile=@VARBASE@/run/sshd.pid
+pidfile=/var/run/sshd.pid
required_files=/etc/ssh/sshd_config
depend()
