From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RjH1p-0001VN-7N for garchives@archives.gentoo.org; Fri, 06 Jan 2012 21:08:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E98421C05C; Fri, 6 Jan 2012 21:08:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3843621C05C for ; Fri, 6 Jan 2012 21:08:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B77F71B409B for ; Fri, 6 Jan 2012 21:08:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3581480042 for ; Fri, 6 Jan 2012 21:08:32 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <84aa4ba8182ffe69ddaa81e94e53a63af155fc1b.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: net/ X-VCS-Repository: proj/openrc X-VCS-Files: net/ifconfig.sh.Linux.in net/iproute2.sh X-VCS-Directories: net/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 84aa4ba8182ffe69ddaa81e94e53a63af155fc1b Date: Fri, 6 Jan 2012 21:08:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b51816dd-0532-4ce1-b8ad-14925687ba7e X-Archives-Hash: 3ef5524970cad8028f0247c0fdfea260 commit: 84aa4ba8182ffe69ddaa81e94e53a63af155fc1b Author: William Hubbs gentoo org> AuthorDate: Fri Jan 6 20:51:43 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Jan 6 20:51:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D84aa4ba8 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=3D397875 --- net/ifconfig.sh.Linux.in | 11 +---------- net/iproute2.sh | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in index 2ac63fd..80a0b98 100644 --- a/net/ifconfig.sh.Linux.in +++ b/net/ifconfig.sh.Linux.in @@ -1,18 +1,9 @@ # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. =20 -_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 } =20 diff --git a/net/iproute2.sh b/net/iproute2.sh index 23ada48..bb52e98 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 } =20