Ensure that our scripts call prefixed runscript.

10 files changed, 18 insertions, 18 deletions

diff --git a/init.d.misc/avahi-dnsconfd.in b/init.d.misc/avahi-dnsconfd.in
index dc12688..8153f0c 100644
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -1,8 +1,8 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-command=@PREFIX@/sbin/avahi-dnsconfd
+command=@PKG_PREFIX@/sbin/avahi-dnsconfd
 command_args="${avahi_dnsconfd_args} -D"
 pidfile=@VARBASE@/run/avahi-dnsconfd.pid
 name="Avahi DNS Configuration Daemon"
diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in
index 7ef37e2..458fc0b 100644
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -1,8 +1,8 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-command=@PREFIX@%%/sbin/avahi-daemon
+command=@PKG_PREFIX@/sbin/avahi-daemon
 command_args="${avahid_args} -D"
 pidfile=@VARBASE@/run/avahi-daemon/pid
 name="Avahi Service Advertisement Daemon"
diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
index d022662..1e8af36 100644
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -1,8 +1,8 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-command=@PREFIX@%%/bin/dbus-daemon
+command=@PKG_PREFIX@/bin/dbus-daemon
 pidfile=@VARBASE@/run/dbus/dbus.pid
 command_args="${dbusd_args---system}"
 name="Message Bus Daemon"
diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in
index 067b3c6..da7b5fb 100644
--- a/init.d.misc/dnsmasq.in
+++ b/init.d.misc/dnsmasq.in
@@ -1,8 +1,8 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-command=@PREFIX@/sbin/dnsmasq
+command=@PKG_PREFIX@/sbin/dnsmasq
 command_args=${dnsmasq_args}
 pidfile=@VARBASE@/run/dnsmasq.pid
 required_files=/etc/dnsmasq.conf
diff --git a/init.d.misc/hald.in b/init.d.misc/hald.in
index 591cd0b..dd7802d 100644
--- a/init.d.misc/hald.in
+++ b/init.d.misc/hald.in
@@ -1,8 +1,8 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-command=@PREFIX@/sbin/hald
+command=@PKG_PREFIX@/sbin/hald
 pidfile=@VARBASE@/run/hald/hald.pid
 command_args="${hald_args}"
 name="Hardware Abstraction Layer Daemon"
diff --git a/init.d.misc/named.in b/init.d.misc/named.in
index 2bdbef7..390a993 100644
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in
index 618da8a..7039323 100644
--- a/init.d.misc/ntpd.in
+++ b/init.d.misc/ntpd.in
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
index 9fbf03c..9e55f42 100644
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -1,14 +1,14 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
 vpn=${SVCNAME#*.}
 name="OpenVPN"
 [ "${vpn}" != "openvpn" ] && name="${name} (${vpn})"
-command=@PREFIX@/sbin/openvpn
+command=@PKG_PREFIX@/sbin/openvpn
 
 pidfile=@VARBASE@/run/"${SVCNAME}".pid
-openvpn_dir=${openvpn_dir:-@PREFIX@/etc/openvpn}
+openvpn_dir=${openvpn_dir:-@PKG_PREFIX@/etc/openvpn}
 openvpn_config=${openvpn_config:-${openvpn_dir}/${vpn}.conf}
 command_args="${openvpn_args} --daemon --config ${openvpn_config} --writepid ${pidfile}"
 required_dirs="${openvpn_dir}"
diff --git a/init.d.misc/polkitd.in b/init.d.misc/polkitd.in
index b76a88a..a1736a9 100644
--- a/init.d.misc/polkitd.in
+++ b/init.d.misc/polkitd.in
@@ -1,8 +1,8 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-command=@PREFIX@/sbin/polkitd
+command=@PKG_PREFIX@/sbin/polkitd
 pidfile=@VARBASE@/run/polkitd/polkitd.pid
 command_args="${polkitd_args}"
 name="PolicyKit Daemon"
diff --git a/init.d.misc/sshd.in b/init.d.misc/sshd.in
index 4134172..8c5c8b3 100644
--- a/init.d.misc/sshd.in
+++ b/init.d.misc/sshd.in
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.