From d3ccbdb5a94e61e84bdc2d82d450ee8a5e4a22f4 Mon Sep 17 00:00:00 2001
From: William Hubbs <williamh@gentoo.org>
Date: Mon, 9 Aug 2010 20:01:15 -0500
Subject: [PATCH] allow ip to be in /sbin or /bin

This makes it possible for the "ip" program in iproute2 to be installed
in /sbin or /bin.
---
 init.d/network.in |  6 +++---
 net/iproute2.sh   | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/init.d/network.in b/init.d/network.in
index 135e5d87..01e88ce8 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -63,7 +63,7 @@ tentative()
 
 	case "$RC_UNAME" in
 	Linux)
-		[ -x /sbin/ip ] || return 1
+		[ -x /sbin/ip ] || [ -x /bin/ip ] || return 1
 		[ -n "$(ip -f inet6 addr show tentative)" ]
 		;;
 	*)
@@ -161,7 +161,7 @@ runip()
 routeflush()
 {
 	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 delete default 2>/dev/null
 		else
@@ -338,7 +338,7 @@ stop()
 		then
 			veinfo "$int"
 			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
 				# fail to add things correctly on restart
 				ip address flush dev "$int" 2>/dev/null
diff --git a/net/iproute2.sh b/net/iproute2.sh
index 906a45e0..09a72d73 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -1,9 +1,18 @@
 # 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
+}
+
 iproute2_depend()
 {
-	program /sbin/ip
+	program $(_ip)
 	provide interface
 	after ifconfig
 }