emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow ip to be in /sbin or /bin

Browse Source 
This makes it possible for the "ip" program in iproute2 to be installed
in /sbin or /bin.
This commit is contained in:
William Hubbs 2010-08-09 20:01:15 -05:00
parent 1cdf85e1ce
commit d3ccbdb5a9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init.d/network.in
View File

@ -63,7 +63,7 @@ tentative()
case "$RC_UNAME" in case "$RC_UNAME" in
Linux) Linux)
[ -x /sbin/ip ] || return 1 [ -x /sbin/ip ] || [ -x /bin/ip ] || return 1
[ -n "$(ip -f inet6 addr show tentative)" ] [ -n "$(ip -f inet6 addr show tentative)" ]
;; ;;
*) *)
@ -161,7 +161,7 @@ runip()
routeflush() routeflush()
{ {
if [ "$RC_UNAME" = Linux ]; then if [ "$RC_UNAME" = Linux ]; then
if [ -x /sbin/ip ]; then if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
ip route flush scope global ip route flush scope global
ip route delete default 2>/dev/null ip route delete default 2>/dev/null
else else
@ -338,7 +338,7 @@ stop()
then then
veinfo "$int" veinfo "$int"
runargs /etc/ifdown."$int" "$downcmd" runargs /etc/ifdown."$int" "$downcmd"
if [ -x /sbin/ip ]; then if [ -x /sbin/ip ] || [ -x /bin/ip ]; then
# We need to do this, otherwise we may # We need to do this, otherwise we may
# fail to add things correctly on restart # fail to add things correctly on restart
ip address flush dev "$int" 2>/dev/null ip address flush dev "$int" 2>/dev/null

11
net/iproute2.sh
View File

@ -1,9 +1,18 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name> # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license. # All rights reserved. Released under the 2-clause BSD license.
_ip()
{
if [ -x /bin/ip ]; then
echo /bin/ip
else
echo /sbin/ip
fi
}
iproute2_depend() iproute2_depend()
{ {
program /sbin/ip program $(_ip)
provide interface provide interface
after ifconfig after ifconfig
} }