diff options
| author | Roy Marples <roy@marples.name> | 2008-03-05 12:27:11 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-05 12:27:11 +0000 |
| commit | a689b66023ad7b3da179b02c9e473cbc49f295e6 (patch) | |
| tree | c1e6baad98bdfde3c36f1105b8fe6f15534b30c4 /init.d.BSD | |
| parent | 7aa231de2e784b00267cb618b728cf0f754c9573 (diff) | |
| download | openrc-a689b66023ad7b3da179b02c9e473cbc49f295e6.tar.gz openrc-a689b66023ad7b3da179b02c9e473cbc49f295e6.tar.bz2 openrc-a689b66023ad7b3da179b02c9e473cbc49f295e6.tar.xz | |
Add tunable SYSCONFDIR
Diffstat (limited to 'init.d.BSD')
| -rw-r--r-- | init.d.BSD/Makefile | 2 | ||||
| -rw-r--r-- | init.d.BSD/rc-enabled.in | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/init.d.BSD/Makefile b/init.d.BSD/Makefile index b83e421..8edff64 100644 --- a/init.d.BSD/Makefile +++ b/init.d.BSD/Makefile @@ -1,4 +1,4 @@ -DIR= /etc/init.d +DIR= ${INITDIR} SRCS= hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \ rpcbind.in savecore.in sysctl.in syslogd.in BIN= ${OBJS} diff --git a/init.d.BSD/rc-enabled.in b/init.d.BSD/rc-enabled.in index ab21b4a..9801203 100644 --- a/init.d.BSD/rc-enabled.in +++ b/init.d.BSD/rc-enabled.in @@ -14,7 +14,7 @@ start() { ebegin "Starting local rc services" local svc= enabled= retval=0 service= - for svc in $(rcorder /etc/rc.d/* /usr/local/etc/rc.d/* 2>/dev/null); do + for svc in $(rcorder /etc/rc.d/* @PKG_PREFIX@/etc/rc.d/* 2>/dev/null); do [ -x "$svc" ] || continue service=${svc##*/} @@ -24,8 +24,9 @@ start() done # If we have an init script for this service, continue - [ -x /etc/init.d/"${service}" ] && continue - [ -x /usr/local/etc/init.d/"${service}" ] && continue + [ -x @SYSCONFDIR@/init.d/"${service}" ] && continue + [ -x @PKG_PREFIX@/@SYSCONFDIR@/init.d/"${service}" ] && continue + [ -x @LOCAL_PREFIX@/@SYSCONFDIR@/init.d/"${service}" ] && continue # Ensure that the users rc.conf will start us - ignore the defaults eval enabled=\$${svc##*/}_enable |