aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.d.misc/Makefile3
-rw-r--r--init.d.misc/dbus.in2
-rw-r--r--init.d.misc/named.in14
3 files changed, 16 insertions, 3 deletions
diff --git a/init.d.misc/Makefile b/init.d.misc/Makefile
index 608407f9..522fd9d8 100644
--- a/init.d.misc/Makefile
+++ b/init.d.misc/Makefile
@@ -3,5 +3,8 @@ SRCS= avahi-dnsconfd.in avahid.in dbus.in hald.in named.in ntpd.in \
openvpn.in polkitd.in sshd.in
MK= ../mk
+
+SED_EXTRA+= -e 's:@VARBASE@:/var:g'
+
include ${MK}/scripts.mk
include Makefile.${OS}
diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
index 305b784c..445ee408 100644
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -3,7 +3,7 @@
# All rights reserved. Released under the 2-clause BSD license.
command=@PKG_PREFIX@/bin/dbus-daemon
-pidfile=@VARBASE@/run/dbus/dbus.pid
+pidfile=@VARBASE@/run/dbus/pid
command_args="${dbusd_args---system}"
name="Message Bus Daemon"
diff --git a/init.d.misc/named.in b/init.d.misc/named.in
index d5218ea7..3674442d 100644
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -4,12 +4,22 @@
command=/usr/sbin/named
command_args=${named_args}
-pidfile=@VARBASE@/run/named/pid
+pidfile=@VARBASE@/run/named.pid
name="Domain Name server"
extra_started_commands="reload"
namedb=/etc/namedb
-named_uid=${named_uid:-bind}
+uid=named
+case "${RC_UNAME}" in
+ FreeBSD)
+ uid=bind
+ pidfile=@VARBASE@/run/named/pid
+ ;;
+ Linux)
+ uid=bind
+ ;;
+esac
+named_uid=${named_uid:-${uid}}
depend()
{