Ensure that rc.d services are not started twice if PKG_DIR is blank.

Fixes #170

1 files changed, 4 insertions, 3 deletions

diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in
index f01870a9..fe842160 100644
--- a/init.d/rc-enabled.in
+++ b/init.d/rc-enabled.in
@@ -13,8 +13,9 @@ depend()
 start()
 {
 	ebegin "Starting local rc services"
-	local svc= enabled= retval=0 service=
-	for svc in $(rcorder /etc/rc.d/* @PKG_PREFIX@/etc/rc.d/* 2>/dev/null); do
+	local svc= enabled= retval=0 service= pkgdir=
+	[ -n "@PKG_PREFIX@" ] && pkgdir="@PKG_PREFIX@/etc/rc.d/*"
+	for svc in $(rcorder /etc/rc.d/* $pkgdir 2>/dev/null); do
 		[ -x "$svc" ] || continue
 		service=${svc##*/}
 
@@ -26,7 +27,7 @@ start()
 		# If we have an init script for this service, continue
 		rc-service --exists "$service" && continue
 
-		# Ensure that the users rc.conf will start us - ignore the defaults
+		# Ensure that the users rc.conf will start us
 		eval enabled=\$${svc##*/}_enable
 		yesno $enabled || yesno ${svc##*/} || continue