| 1 |
commit: 84aa4ba8182ffe69ddaa81e94e53a63af155fc1b |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 6 20:51:43 2012 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 6 20:51:43 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=84aa4ba8 |
| 7 |
|
| 8 |
Revert "net/ifconfig net/iproute2: support lookup ifconfig/ip dynamically" |
| 9 |
|
| 10 |
This reverts commit f583030e3cbfb1d2f30af3ebd00427e12fe66b70. |
| 11 |
|
| 12 |
The previous commit did not account for the case of not having iproute2 |
| 13 |
installed. |
| 14 |
|
| 15 |
Reported-by: Duncan <1i5t5.duncan <AT> cox.net> |
| 16 |
X-Gentoo-Bug: 397875 |
| 17 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397875 |
| 18 |
|
| 19 |
--- |
| 20 |
net/ifconfig.sh.Linux.in | 11 +---------- |
| 21 |
net/iproute2.sh | 2 +- |
| 22 |
2 files changed, 2 insertions(+), 11 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in |
| 25 |
index 2ac63fd..80a0b98 100644 |
| 26 |
--- a/net/ifconfig.sh.Linux.in |
| 27 |
+++ b/net/ifconfig.sh.Linux.in |
| 28 |
@@ -1,18 +1,9 @@ |
| 29 |
# Copyright (c) 2007-2008 Roy Marples <roy@×××××××.name> |
| 30 |
# Released under the 2-clause BSD license. |
| 31 |
|
| 32 |
-_ifconfig() |
| 33 |
-{ |
| 34 |
- if [ -x /bin/ifconfig ]; then |
| 35 |
- echo /bin/ifconfig |
| 36 |
- else |
| 37 |
- which ifconfig 2>/dev/null |
| 38 |
- fi |
| 39 |
-} |
| 40 |
- |
| 41 |
ifconfig_depend() |
| 42 |
{ |
| 43 |
- program $(_ifconfig) |
| 44 |
+ program /sbin/ifconfig |
| 45 |
provide interface |
| 46 |
} |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/net/iproute2.sh b/net/iproute2.sh |
| 50 |
index 23ada48..bb52e98 100644 |
| 51 |
--- a/net/iproute2.sh |
| 52 |
+++ b/net/iproute2.sh |
| 53 |
@@ -6,7 +6,7 @@ _ip() |
| 54 |
if [ -x /bin/ip ]; then |
| 55 |
echo /bin/ip |
| 56 |
else |
| 57 |
- which ip 2>/dev/null |
| 58 |
+ echo /sbin/ip |
| 59 |
fi |
| 60 |
} |
Archives