From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/openrc:master commit in: net/
Date: Sat, 7 Jan 2012 21:56:50 +0000 (UTC) [thread overview]
Message-ID: <61e05331d14a08fa909526fda15470a1ca4927dd.WilliamH@gentoo> (raw)
commit: 61e05331d14a08fa909526fda15470a1ca4927dd
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 21:41:43 2012 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 21:41:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=61e05331
net: make lookup of iproute2 dynamic
The iproute2, macvlan and vlan modules had several possible hard coded
paths for the iproute2 binary. Now we look for it in the path.
---
net/iproute2.sh | 14 ++++----------
net/macvlan.sh | 14 ++++----------
net/vlan.sh | 14 ++++----------
3 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/net/iproute2.sh b/net/iproute2.sh
index bb52e98..16d9a60 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -1,18 +1,12 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license.
-_ip()
-{
- if [ -x /bin/ip ]; then
- echo /bin/ip
- else
- echo /sbin/ip
- fi
-}
-
iproute2_depend()
{
- program $(_ip)
+ local x
+ x=$(_which ip)
+ [ -z "$x" ] && return 1
+ program $x
provide interface
after ifconfig
}
diff --git a/net/macvlan.sh b/net/macvlan.sh
index 422268e..ccb28ea 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -3,18 +3,12 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license.
-_ip()
-{
- if [ -x /bin/ip ]; then
- echo /bin/ip
- else
- echo /sbin/ip
- fi
-}
-
macvlan_depend()
{
- program $(_ip)
+ local x
+ x=$(_which ip)
+ [ -z "${X}" ] && return 1
+ program $x
after interface
before dhcp macchanger
}
diff --git a/net/vlan.sh b/net/vlan.sh
index 960cd09..ec30dd6 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -1,18 +1,12 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license.
-_ip()
-{
- if [ -x /bin/ip ]; then
- echo /bin/ip
- else
- echo /sbin/ip
- fi
-}
-
vlan_depend()
{
- program $(_ip)
+ local x
+ x=$(_which ip)
+ [ -z "$x" ] && return 1
+ program $x
after interface
before dhcp
}
next reply other threads:[~2012-01-07 21:56 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-07 21:56 William Hubbs [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-17 21:39 [gentoo-commits] proj/openrc:master commit in: net/ William Hubbs
2012-12-21 22:45 William Hubbs
2012-12-20 21:28 Robin H. Johnson
2012-11-10 20:58 William Hubbs
2012-11-07 1:45 Robin H. Johnson
2012-11-07 1:45 Robin H. Johnson
2012-11-06 23:23 Robin H. Johnson
2012-11-06 23:19 Robin H. Johnson
2012-11-06 23:19 Robin H. Johnson
2012-10-17 18:51 William Hubbs
2012-10-11 3:57 Robin H. Johnson
2012-10-11 3:57 Robin H. Johnson
2012-10-10 0:11 Robin H. Johnson
2012-09-07 19:57 William Hubbs
2012-07-04 14:20 William Hubbs
2012-06-07 5:36 William Hubbs
2012-05-03 20:43 Robin H. Johnson
2012-04-24 3:32 Christian Ruppert
2012-04-03 21:31 Robin H. Johnson
2012-04-02 4:28 William Hubbs
2012-03-11 19:55 Robin H. Johnson
2012-03-02 19:55 Robin H. Johnson
2012-02-09 9:43 Robin H. Johnson
2012-02-09 9:40 Robin H. Johnson
2012-01-25 18:47 Robin H. Johnson
2012-01-16 17:33 Robin H. Johnson
2012-01-13 4:39 Robin H. Johnson
2012-01-07 21:56 William Hubbs
2012-01-06 21:08 William Hubbs
2012-01-04 21:38 Mike Frysinger
2011-12-30 1:22 William Hubbs
2011-12-30 0:11 William Hubbs
2011-12-28 20:32 Robin H. Johnson
2011-12-27 2:01 Robin H. Johnson
2011-12-27 1:51 Robin H. Johnson
2011-12-27 1:24 Robin H. Johnson
2011-12-27 1:09 Robin H. Johnson
2011-12-21 8:11 Robin H. Johnson
2011-12-21 8:11 Robin H. Johnson
2011-12-21 8:11 Robin H. Johnson
2011-12-13 8:43 Robin H. Johnson
2011-12-13 6:53 Robin H. Johnson
2011-12-13 6:38 William Hubbs
2011-12-13 3:20 Robin H. Johnson
2011-12-13 3:20 Robin H. Johnson
2011-12-10 4:12 William Hubbs
2011-12-10 2:59 William Hubbs
2011-11-23 14:26 William Hubbs
2011-11-22 15:14 William Hubbs
2011-10-07 21:47 Robin H. Johnson
2011-09-21 11:29 Christian Ruppert
2011-09-21 1:58 Christian Ruppert
2011-09-18 22:04 Christian Ruppert
2011-09-18 12:45 Christian Ruppert
2011-09-16 23:14 Christian Ruppert
2011-09-16 22:18 Christian Ruppert
2011-09-16 21:48 Christian Ruppert
2011-07-18 23:57 Robin H. Johnson
2011-06-28 4:08 Mike Frysinger
2011-05-16 19:58 William Hubbs
2011-05-16 13:23 Anthony G. Basile
2011-05-16 5:22 Mike Frysinger
2011-04-07 12:51 William Hubbs
2011-03-27 20:46 William Hubbs
2011-03-18 18:25 Mike Frysinger
2011-02-21 9:56 Robin H. Johnson
2011-02-12 19:37 William Hubbs
2011-02-05 13:28 William Hubbs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=61e05331d14a08fa909526fda15470a1ca4927dd.WilliamH@gentoo \
--to=williamh@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox