Fix rc_${rc_svcname}_need.
Display config depends in service depend function also.
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
# All rights reserved. Released under the 2-clause BSD license.
|
||||
|
||||
. @SYSCONFDIR@/init.d/functions.sh
|
||||
. @LIBEXECDIR@/sh/rc-functions.sh
|
||||
|
||||
config() {
|
||||
[ -n "$*" ] && echo "$RC_SVCNAME config $*" >&3
|
||||
@@ -82,24 +83,7 @@ do
|
||||
|
||||
if . "$_dir/$RC_SVCNAME"; then
|
||||
echo "$RC_SVCNAME" >&3
|
||||
depend
|
||||
_rc_svcname=$(shell_var "$RC_SVCNAME")
|
||||
|
||||
# Add any user defined depends
|
||||
for _deptype in config:CONFIG need:NEED use:USE \
|
||||
after:AFTER before:BEFORE \
|
||||
provide:PROVIDE keyword:KEYWORD; do
|
||||
IFS=:
|
||||
set -- $_deptype
|
||||
unset IFS
|
||||
eval _depends=\$rc_$_rc_svcname_$1
|
||||
[ -z "$_depends" ] && eval _depends=\$rc_$1
|
||||
[ -z "$_depends" ] && \
|
||||
eval _depends=\$RC_$_rc_svcname_$2
|
||||
[ -z "$_depends" ] && eval _depends=\$RC_$2
|
||||
|
||||
$1 ${_depends}
|
||||
done
|
||||
_depend
|
||||
fi
|
||||
)
|
||||
done
|
||||
|
Reference in New Issue
Block a user