Ensure that our scripts call prefixed runscript.

2008-03-02 21:14:01 +00:00
parent a12dbdc6c9
commit 67c5fd6bb8
56 changed files with 89 additions and 75 deletions
--- a/4
+++ b/4
@@ -6,7 +6,9 @@ NAME=		openrc
 VERSION=	0.1
 PKG=		${NAME}-${VERSION}

-SUBDIR=		conf.d doc etc init.d man net runlevels sh src
+SUBDIR=		conf.d doc etc init.d man net sh src
+# We need to ensure that runlevels is done last
+SUBDIR+=	runlevels

 INSTALLAFTER=	_installafter

--- a/init.d.BSD/hostid.in
+++ b/init.d.BSD/hostid.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.

--- a/init.d.BSD/moused.in
+++ b/init.d.BSD/moused.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.

--- a/init.d.BSD/newsyslog.in
+++ b/init.d.BSD/newsyslog.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.

--- a/init.d.BSD/pf.in
+++ b/init.d.BSD/pf.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.

--- a/init.d.BSD/rarpd.in
+++ b/init.d.BSD/rarpd.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.

--- a/init.d.BSD/rc-enabled.in
+++ b/init.d.BSD/rc-enabled.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.

--- a/init.d.BSD/rpcbind.in
+++ b/init.d.BSD/rpcbind.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.

--- a/init.d.BSD/savecore.in
+++ b/init.d.BSD/savecore.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.

--- a/init.d.BSD/swap-blk.in
+++ b/init.d.BSD/swap-blk.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.

--- a/init.d.BSD/sysctl.in
+++ b/init.d.BSD/sysctl.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.

--- a/init.d.BSD/syslogd.in
+++ b/init.d.BSD/syslogd.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.

--- a/init.d.FreeBSD/clock.in
+++ b/init.d.FreeBSD/clock.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.

--- a/init.d.FreeBSD/devd.in
+++ b/init.d.FreeBSD/devd.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.

--- a/init.d.FreeBSD/dumpon.in
+++ b/init.d.FreeBSD/dumpon.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.

--- a/init.d.FreeBSD/ipfw.in
+++ b/init.d.FreeBSD/ipfw.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.

--- a/init.d.FreeBSD/mixer.in
+++ b/init.d.FreeBSD/mixer.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.

--- a/init.d.FreeBSD/nscd.in
+++ b/init.d.FreeBSD/nscd.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.

--- a/init.d.FreeBSD/powerd.in
+++ b/init.d.FreeBSD/powerd.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.

--- a/init.d.FreeBSD/syscons.in
+++ b/init.d.FreeBSD/syscons.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.

--- a/init.d.Linux/clock.in
+++ b/init.d.Linux/clock.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.

--- a/init.d.Linux/consolefont.in
+++ b/init.d.Linux/consolefont.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.

--- a/init.d.Linux/keymaps.in
+++ b/init.d.Linux/keymaps.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.

--- a/init.d.Linux/modules.in
+++ b/init.d.Linux/modules.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.

--- a/init.d.Linux/mtab.in
+++ b/init.d.Linux/mtab.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.

--- a/init.d.Linux/numlock.in
+++ b/init.d.Linux/numlock.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.

--- a/init.d.Linux/procfs.in
+++ b/init.d.Linux/procfs.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.

--- a/init.d.Linux/sysctl.in
+++ b/init.d.Linux/sysctl.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.

--- a/init.d.NetBSD/ttys.in
+++ b/init.d.NetBSD/ttys.in
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.

--- a/init.d.NetBSD/wscons.in
+++ b/init.d.NetBSD/wscons.in
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!@PREFIX@/sbin/runscript
 # Copyright 2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.

--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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.

--- 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.

--- 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}"
--- 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"
--- 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.

--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.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.

--- a/init.d/fsck.in
+++ b/init.d/fsck.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.

--- a/init.d/hostname.in
+++ b/init.d/hostname.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.

--- a/init.d/local.in
+++ b/init.d/local.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.

--- a/init.d/localmount.in
+++ b/init.d/localmount.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.

--- a/init.d/netmount.in
+++ b/init.d/netmount.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.

--- a/init.d/root.in
+++ b/init.d/root.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.

--- a/init.d/swap.in
+++ b/init.d/swap.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.

--- a/init.d/urandom.in
+++ b/init.d/urandom.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.

--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -1,12 +1,12 @@
 # Install rules for our scripts
 # Copyright 2007-2008 Roy Marples <roy@marples.name>

-_IN_SH=	ls -1 | sed -n -e 's:\.in$$::p' | xargs
+_IN_SH=	ls -1 | sed -n -e 's:\.in$$::p' | xargs; echo
 _IN!=		${_IN_SH}
 OBJS+=		${_IN}$(shell ${_IN_SH})

 # We store the contents of the directory for ease of use in Makefiles
-_CONTENTS_SH=	ls -1 | grep -v "\(Makefile\|.in$$\)" | sed -e 's:\.in$$::g' | xargs
+_CONTENTS_SH=	ls -1 | grep -v Makefile | sed -e 's:\.in$$::g' | sort -u | xargs
 _CONTENTS!=	${_CONTENTS_SH}
 CONTENTS=	${_CONTENTS}$(shell ${_CONTENTS_SH})

@@ -14,10 +14,13 @@ include ${MK}/sys.mk
 include ${MK}/os.mk

 # Tweak our shell scripts
-.SUFFIXES:	.sh.in
+.SUFFIXES:	.sh.in .in
 .sh.in.sh:
 	sed -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' $< > $@

+.in:
+	sed -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' $< > $@
+
 all: ${OBJS}

 realinstall: ${BIN} ${CONF} ${CONF_APPEND}
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -17,11 +17,20 @@ all:
 install:
 	if ! test -d "${BOOTDIR}"; then \
 		${INSTALL} -d ${BOOTDIR} || exit $$?; \
-		for x in ${BOOT}; do ln -snf /etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; done \
+		for x in ${BOOT}; do \
+			if test -n "${PREFIX}"; then \
+				grep -q "keyword .*noprefix" ${PREFIX}/etc/init.d/"$$x" && continue; \
+			fi; \
+			ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
+		done \
 	fi
 	if ! test -d "${DEFAULTDIR}"; then \
 		${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
-		for x in ${DEFAULT}; do ln -snf /etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
+		for x in ${DEFAULT}; do \
+			if test -n "${PREFIX}"; then \
+				grep -q "keyword .*noprefix" ${PREFIX}/etc/init.d/"$$x" && continue; \
+			fi; \
+			ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
 	fi

 clean:
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -13,7 +13,7 @@ include ${MK}/scripts.mk
 _installafter:
 	${INSTALL} -d ${DESTDIR}/${PREFIX}/etc/init.d
 	@# Provide an init script for the loopback interface
-	ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/${PREFIX}/etc/init.d/${NET_LO} || exit $$?
+	ln -snf ${PREFIX}/${RC_LIB}/sh/net.sh ${DESTDIR}/${PREFIX}/etc/init.d/${NET_LO} || exit $$?
 	@# Put functions.sh into the init.d dir so 3rd party apps don't have to
 	@# be multilib aware
-	ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/${PREFIX}/etc/init.d || exit $$?
+	ln -snf ${PREFIX}/${RC_LIB}/sh/functions.sh ${DESTDIR}/${PREFIX}/etc/init.d || exit $$?
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -43,8 +43,8 @@ _sanitize_path()
 	local IFS=":" p= path=
 	for p in ${PATH}; do
 		case "${p}" in
-			@PREFIX@/lib/rc/sbin|/bin|/sbin|/usr/bin|/usr/sbin|@PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);;
-			*) path="${path}:${p}";;
+			@PREFIX@/lib/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin|@PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);;
+			*) path="${path}${path:+:}${p}";;
 		esac
 	done

@@ -60,7 +60,7 @@ if [ -n "${ZSH_VERSION}" ]; then
 fi

 # Add our bin to $PATH
-export PATH="@PREFIX@/lib/rc/bin:/bin:/sbin:/usr/bin:/usr/sbin:@PKG_PREFIX@/bin:@PKG_PREFIX@/sbin:$(_sanitize_path "${PATH}")"
+export PATH="@PREFIX@/lib/rc/bin:@PREFIX@/bin:@PREFIX@/sbin:/usr/bin:/usr/sbin:@PKG_PREFIX@/bin:@PKG_PREFIX@/sbin:$(_sanitize_path "${PATH}")"
 unset _sanitize_path

 for arg; do
--- a/sh/gendepends.sh.in
+++ b/sh/gendepends.sh.in
@@ -4,7 +4,7 @@
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.

-. /etc/init.d/functions.sh
+. @PREFIX@/etc/init.d/functions.sh

 config() {
 	[ -n "$*" ] && echo "${SVCNAME} config $*" >&3
@@ -31,7 +31,7 @@ depend() {
 	:
 }

-for _dir in /etc/init.d /usr/local/etc/init.d; do
+for _dir in @PREFIX@/etc/init.d @PKG_PREFIX@/etc/init.d; do
 	[ -d "${_dir}" ] || continue
 	cd "${_dir}"
 	for SVCNAME in *; do
@@ -39,7 +39,7 @@ for _dir in /etc/init.d /usr/local/etc/init.d; do

 		# Only generate dependencies for runscripts
 		read one two < "${SVCNAME}"
-		[ "${one}" = "#!/sbin/runscript" ] || continue
+		[ "${one}" = "#!@PREFIX@/sbin/runscript" ] || continue
 		unset one two

 		export SVCNAME=${SVCNAME##*/}
@@ -59,7 +59,7 @@ for _dir in /etc/init.d /usr/local/etc/init.d; do
 			. "${_dir}/../conf.d/${SVCNAME}"
 		fi

-		[ -e /etc/rc.conf ] && . /etc/rc.conf
+		[ -e @PREFIX@/etc/rc.conf ] && . @PREFIX@/etc/rc.conf

 		if . "${_dir}/${SVCNAME}"; then
 			echo "${SVCNAME}" >&3
--- a/sh/net.sh
+++ b/sh/net.sh
@@ -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.

@@ -21,7 +21,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword nojail
+	keyword nojail noprefix

 	case "${IFACE}" in
 		lo|lo0);;
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -4,7 +4,7 @@
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.

-. /etc/init.d/functions.sh
+. @PREFIX@/etc/init.d/functions.sh
 . "${RC_LIBDIR}"/sh/rc-functions.sh

 # Support LiveCD foo
@@ -59,7 +59,7 @@ elif [ -e "/etc/conf.d/${SVCNAME}" ]; then
 fi

 # Load any system overrides
-[ -e /etc/rc.conf ] && . /etc/rc.conf
+[ -e @PREFIX@/etc/rc.conf ] && . @PREFIX@/etc/rc.conf

 # Apply any ulimit defined
 [ -n "${rc_ulimit:-${RC_ULIMIT}}" ] && ulimit ${rc_ulimit:-${RC_ULIMIT}}