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 1RiYXD-0008DO-69 for garchives@archives.gentoo.org; Wed, 04 Jan 2012 21:38:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B534021C046; Wed, 4 Jan 2012 21:38:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8830A21C046 for ; Wed, 4 Jan 2012 21:38:03 +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 0E6251B40DD for ; Wed, 4 Jan 2012 21:38:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4304980042 for ; Wed, 4 Jan 2012 21:38:02 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: 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: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f583030e3cbfb1d2f30af3ebd00427e12fe66b70 Date: Wed, 4 Jan 2012 21:38:02 +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: f98f7dda-f732-4984-aa9a-70b8e2d59be2 X-Archives-Hash: 46d96a7fa15987786c201edc07ca8219 commit: f583030e3cbfb1d2f30af3ebd00427e12fe66b70 Author: Mike Frysinger gentoo org> AuthorDate: Wed Jan 4 21:37:33 2012 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 4 21:38:11 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Df583030e net/ifconfig net/iproute2: support lookup ifconfig/ip dynamically Signed-off-by: Mike Frysinger gentoo.org> --- net/ifconfig.sh.Linux.in | 11 ++++++++++- net/iproute2.sh | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in index 80a0b98..2ac63fd 100644 --- a/net/ifconfig.sh.Linux.in +++ b/net/ifconfig.sh.Linux.in @@ -1,9 +1,18 @@ # 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 /sbin/ifconfig + program $(_ifconfig) provide interface } =20 diff --git a/net/iproute2.sh b/net/iproute2.sh index bb52e98..23ada48 100644 --- a/net/iproute2.sh +++ b/net/iproute2.sh @@ -6,7 +6,7 @@ _ip() if [ -x /bin/ip ]; then echo /bin/ip else - echo /sbin/ip + which ip 2>/dev/null fi } =20