aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-01-06 14:51:43 -0600
committerWilliam Hubbs <williamh@gentoo.org>2012-01-06 14:51:43 -0600
commit84aa4ba8182ffe69ddaa81e94e53a63af155fc1b (patch)
treeebec3461612f0779a1925ac6394db9c6ffbc9c12
parent982ac38f35b5f0c7d80341783e74f803c177e8dd (diff)
Revert "net/ifconfig net/iproute2: support lookup ifconfig/ip dynamically"
This reverts commit f583030e3cbfb1d2f30af3ebd00427e12fe66b70. The previous commit did not account for the case of not having iproute2 installed. Reported-by: Duncan <1i5t5.duncan@cox.net> X-Gentoo-Bug: 397875 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397875
-rw-r--r--net/ifconfig.sh.Linux.in11
-rw-r--r--net/iproute2.sh2
2 files changed, 2 insertions, 11 deletions
diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 2ac63fd4..80a0b987 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -1,18 +1,9 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license.
-_ifconfig()
-{
- if [ -x /bin/ifconfig ]; then
- echo /bin/ifconfig
- else
- which ifconfig 2>/dev/null
- fi
-}
-
ifconfig_depend()
{
- program $(_ifconfig)
+ program /sbin/ifconfig
provide interface
}
diff --git a/net/iproute2.sh b/net/iproute2.sh
index 23ada481..bb52e983 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -6,7 +6,7 @@ _ip()
if [ -x /bin/ip ]; then
echo /bin/ip
else
- which ip 2>/dev/null
+ echo /sbin/ip
fi
}