aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-10 23:23:39 +0000
committerRoy Marples <roy@marples.name>2008-01-10 23:23:39 +0000
commitacbaacb2c1dd96d7e084c1b8bd90ea730a422e6e (patch)
tree51465335cebf71511e5938f82f379ff1e740ec32
parent2d95c9a756c4c7b9301e04c274c3b139e0d1aef4 (diff)
dhcpcd could be anywhere, so allow this.
-rw-r--r--net/dhcpcd.sh2
-rwxr-xr-xsh/net.sh8
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
diff --git a/sh/net.sh b/sh/net.sh
index ab648a07..fc440952 100755
--- a/sh/net.sh
+++ b/sh/net.sh
@@ -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