--- /sbin/runscript.sh.orig	2003-06-18 05:17:06.000000000 -0400
+++ /sbin/runscript.sh	2003-06-26 10:17:26.000000000 -0400
@@ -41,15 +41,16 @@
 #     configuration, if the system administrator chose to put it
 #     there (if it exists).
 
-[ -e /etc/conf.d/basic ]                  && source /etc/conf.d/basic
+[ -e `add_suffix /etc/conf.d/basic` ] && source `add_suffix /etc/conf.d/basic`
 
-[ -e "/etc/conf.d/${myservice}" ]         && source "/etc/conf.d/${myservice}"
+[ -e `add_suffix "/etc/conf.d/${myservice}"` ]  && \
+                               source  `add_suffix "/etc/conf.d/${myservice}"`
 
-[ -e /etc/conf.d/net ]                    && \
+[ -e `add_suffix /etc/conf.d/net` ]       && \
 [ "${myservice%%.*}" = "net" ]            && \
-[ "${myservice##*.}" != "${myservice}" ]  && source /etc/conf.d/net
+[ "${myservice##*.}" != "${myservice}" ]  && source `add_suffix /etc/conf.d/net`
 
-[ -e /etc/rc.conf ]                       && source /etc/rc.conf
+[ -e `add_suffix /etc/rc.conf` ]          && source `add_suffix /etc/rc.conf`
 
 usage() {
 	local IFS="|"
@@ -108,7 +109,7 @@
 	if [ "${NETSERVICE}" = "yes" ]
 	then
 		# A net.* service
-		if [ -L "/etc/runlevels/boot/${myservice}" -o \
+		if [ -L "/etc/runlevels/${BOOTLEVEL}/${myservice}" -o \
 		     -L "/etc/runlevels/${mylevel}/${myservice}" ]
 		then
 			local netcount="$(ls -1 "${svcdir}"/started/net.* 2> /dev/null | \
@@ -242,7 +243,7 @@
 		do
 			if [ "${x}" = "net" ]
 			then
-				local netservlist="$(dolisting "/etc/runlevels/boot/net.*") \
+				local netservlist="$(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
 					$(dolisting "/etc/runlevels/${mylevel}/net.*")"
 					
 				for y in ${netservlist}
@@ -310,7 +311,7 @@
 		# Remove link if service didn't start; but only if we're not booting
 		# if we're booting, we need to continue and do our best to get the
 		# system up.
-		if [ "${retval}" -ne "0" -a "${SOFTLEVEL}" != "boot" ]
+		if [ "${retval}" -ne "0" -a "${SOFTLEVEL}" != "${BOOTLEVEL}" ]
 		then
 			rm -f "${svcdir}/started/${myservice}"
 		fi
@@ -441,7 +442,7 @@
 	local y=""
 	for x in $(iuse "$1")
 	do
-		if [ -e "/etc/runlevels/boot/${x}" -o \
+		if [ -e "/etc/runlevels/${BOOTLEVEL}/${x}" -o \
 		     -e "/etc/runlevels/${mylevel}/${x}" ]
 		then
 			z="${x%/*}"
@@ -472,7 +473,7 @@
 	local y=""
 	for x in $(iafter "$1")
 	do
-		if [ -e "/etc/runlevels/boot/${x}" -o \
+		if [ -e "/etc/runlevels/${BOOTLEVEL}/${x}" -o \
 		     -e "/etc/runlevels/${mylevel}/${x}" ]
 		then
 			z="${x%/*}"