diff options
author | Roy Marples <roy@marples.name> | 2008-01-10 23:23:39 +0000 |
---|---|---|
committer | Roy Marples <roy@marples.name> | 2008-01-10 23:23:39 +0000 |
commit | acbaacb2c1dd96d7e084c1b8bd90ea730a422e6e (patch) | |
tree | 51465335cebf71511e5938f82f379ff1e740ec32 | |
parent | 2d95c9a756c4c7b9301e04c274c3b139e0d1aef4 (diff) |
dhcpcd could be anywhere, so allow this.
-rw-r--r-- | net/dhcpcd.sh | 2 | ||||
-rwxr-xr-x | sh/net.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh index 1878a9c0..43d22325 100644 --- a/net/dhcpcd.sh +++ b/net/dhcpcd.sh @@ -24,7 +24,7 @@ dhcpcd_depend() { after interface - program start /sbin/dhcpcd /usr/local/sbin/dhcpcd + program start dhcpcd provide dhcp # We prefer dhcpcd over the others @@ -329,9 +329,13 @@ _load_modules() { if [ -n "$1" ]; then x= for x; do - [ -x "${x}" ] && break + case "${x}" in + /*) [ -x "${x}" ] && break;; + *) type "${x}" >/dev/null 2>&1 && break;; + esac + unset x done - [ -x "${x}" ] || continue + [ -n "${x}" ] || continue fi eval provides=\$module_${i}_provide |