--- /sbin/runscript.sh.orig	2003-07-07 15:19:08.000000000 -0400
+++ /sbin/runscript.sh	2003-07-11 12:12:52.000000000 -0400
@@ -46,15 +46,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() {
@@ -112,7 +113,7 @@
 	# Remove symlink to prevent recursion
 	mark_service_stopped "${myservice}"
 
-	if in_runlevel "${myservice}" "boot" && \
+	if in_runlevel "${myservice}" "${BOOTLEVEL}" && \
 	   [ "${SOFTLEVEL}" != "reboot" -a "${SOFTLEVEL}" != "shutdown" -a \
 	     "${SOFTLEVEL}" != "single" ]
 	then
@@ -124,7 +125,7 @@
 		if [ "${NETSERVICE}" = "yes" ]
 		then
 			# A net.* service
-			if in_runlevel "${myservice}" "boot" || \
+			if in_runlevel "${myservice}" "${BOOTLEVEL}" || \
 			   in_runlevel "${myservice}" "${mylevel}"
 			then
 				local netcount="$(ls -1 "${svcdir}"/started/net.* 2> /dev/null | \
@@ -257,7 +258,7 @@
 		do
 			if [ "${x}" = "net" -a "${NETSERVICE}" != "yes" ]
 			then
-				local netservices="$(dolisting "/etc/runlevels/boot/net.*") \
+				local netservices="$(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
 					$(dolisting "/etc/runlevels/${mylevel}/net.*")"
 					
 				for y in ${netservices}
@@ -328,7 +329,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
 			mark_service_stopped "${myservice}"
 		fi