diff options
| author | Roy Marples <roy@marples.name> | 2010-02-20 21:48:06 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2010-02-20 21:48:06 +0000 |
| commit | 5c52e5beb588d87b1e267d0485b56a2609b5481f (patch) | |
| tree | 5ae131370268f371a42aa9dd3edd482e26c11e83 /sh/gendepends.sh.in | |
| parent | c0f5f2122c28aa16a45fada0f95743d795be5d53 (diff) | |
| download | openrc-5c52e5beb588d87b1e267d0485b56a2609b5481f.tar.gz openrc-5c52e5beb588d87b1e267d0485b56a2609b5481f.tar.bz2 openrc-5c52e5beb588d87b1e267d0485b56a2609b5481f.tar.xz | |
Fix rc_${rc_svcname}_need.
Display config depends in service depend function also.
Diffstat (limited to 'sh/gendepends.sh.in')
| -rw-r--r-- | sh/gendepends.sh.in | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in index 98443b6..95a7b48 100644 --- a/sh/gendepends.sh.in +++ b/sh/gendepends.sh.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 |