diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2012-01-08 16:24:03 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-01-08 16:24:10 -0800 |
| commit | 4255ba175bd7c3ccadc5bc894d00ccb844467067 (patch) | |
| tree | 40965581526479833b09054c5d9dc028348536b9 /net/br2684ctl.sh | |
| parent | d02d3af02e4254b04949de546c5d53af82cc2fc2 (diff) | |
net: net.lo, lots of scripts
The program function in depend blocks is now able to search paths by
itself. If passed multiple arguments or multiple calls, at least one of
the arguments passed must be a program or a shell builtin (eg ip built
into busybox). If a qualified path is specified, only that path will be
checked, otherwise it will be checked as a builtin, then $PATH will be
checked for the named binary (via type).
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'net/br2684ctl.sh')
| -rw-r--r-- | net/br2684ctl.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/br2684ctl.sh b/net/br2684ctl.sh index d6055796..b3f61196 100644 --- a/net/br2684ctl.sh +++ b/net/br2684ctl.sh @@ -1,19 +1,10 @@ # Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Released under the 2-clause BSD license. -_br2684ctl() -{ - if [ -x /usr/sbin/br2684ctl ]; then - echo /usr/sbin/br2684ctl - else - echo /sbin/br2684ctl - fi -} - br2684ctl_depend() { before ppp - program start $(_br2684ctl) + program start br2684ctl } _config_vars="$_config_vars bridge bridge_add brctl" @@ -42,7 +33,7 @@ br2684ctl_pre_start() esac einfo "Starting RFC 2684 Bridge control on ${IFACE}" - start-stop-daemon --start --exec $(_br2684ctl) --background \ + start-stop-daemon --start --exec $(_which br2684ctl) --background \ --make-pidfile --pidfile "/var/run/br2684ctl-${IFACE}.pid" \ -- -c "${IFACE#nas*}" ${opts} eend $? |