net: net.lo, lots of scripts

The program function in depend blocks is now able to search paths by
itself. If passed multiple arguments or multiple calls, at least one of
the arguments passed must be a program or a shell builtin (eg ip built
into busybox). If a qualified path is specified, only that path will be
checked, otherwise it will be checked as a builtin, then $PATH will be
checked for the named binary (via type).

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

init.d/net.lo.in

@@ -172,7 +172,9 @@ _configure_variables()
 _which()
 {
 	local i OIFS
+	# Empty
 	[ -z "$1" ] && return
+	# check paths
 	OIFS="$IFS"
 	IFS=:
 	for i in $PATH ; do
@@ -181,6 +183,22 @@ _which()
 	IFS=$OIFS
 }
 
+# Like _which, but also consider shell builtins, and multiple alternatives
+_program_available()
+{
+	[ -z "$1" ] && return 0
+	local x=
+	for x; do
+		case "${x}" in
+			/*) [ -x "${x}" ] && break;;
+			*) type "${x}" >/dev/null 2>&1 && break;;
+		esac
+		unset x
+	done
+	[ -n "${x}" ] && echo $x && return 0
+	return 1
+}
+
 _show_address()
 {
 	einfo "received address $(_get_inet_address "${IFACE}")"
@@ -323,11 +341,10 @@ _load_modules()
 
 		eval set -- \$module_${i}_program
 		if [ -n "$1" ]; then
-			x=
+			if ! _program_available "$@" >/dev/null; then
-			for x; do
+				vewarn "Skipping module $mod due to missing program: $@"
-				[ -x "${x}" ] && break
+				continue
-			done
+			fi
-			[ -x "${x}" ] || continue
 		fi
 		if ${starting}; then
 			eval set -- \$module_${i}_program_start
@@ -335,15 +352,10 @@ _load_modules()
 			eval set -- \$module_${i}_program_stop
 		fi
 		if [ -n "$1" ]; then
-			x=
+			if ! _program_available "$@" >/dev/null; then
-			for x; do
+				vewarn "Skipping module $mod due to missing program: $@"
-				case "${x}" in
+				continue
-					/*) [ -x "${x}" ] && break;;
+			fi
-					*) type "${x}" >/dev/null 2>&1 && break;;
-				esac
-				unset x
-			done
-			[ -n "${x}" ] || continue
 		fi
 
 		eval provides=\$module_${i}_provide

net/br2684ctl.sh

@@ -1,19 +1,10 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-_br2684ctl()
-{
-	if [ -x /usr/sbin/br2684ctl ]; then
-		echo /usr/sbin/br2684ctl
-	else
-		echo /sbin/br2684ctl
-	fi
-}
-
 br2684ctl_depend()
 {
 	before ppp
-	program start $(_br2684ctl)
+	program start br2684ctl
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"
@@ -42,7 +33,7 @@ br2684ctl_pre_start()
 	esac
 
 	einfo "Starting RFC 2684 Bridge control on ${IFACE}"
-	start-stop-daemon --start --exec $(_br2684ctl) --background \
+	start-stop-daemon --start --exec $(_which br2684ctl) --background \
 		--make-pidfile --pidfile "/var/run/br2684ctl-${IFACE}.pid" \
 		-- -c "${IFACE#nas*}" ${opts}
 	eend $?

net/bridge.sh

@@ -4,7 +4,7 @@
 bridge_depend()
 {
 	before interface macnet
-	program /sbin/brctl
+	program brctl
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"

net/ethtool.sh

@@ -3,10 +3,7 @@
 
 ethtool_depend()
 {
-	local x
+	program ethtool
-	x=$(_which ethtool)
-	[ -z "$x" ] && return 1
-	program $x
 	before interface
 }
 

net/ip6to4.sh

@@ -6,6 +6,7 @@ _config_vars="$_config_vars link suffix relay"
 ip6to4_depend()
 {
 	after interface
+	program ip
 }
 
 ip6to4_pre_start()

net/iproute2.sh

@@ -3,10 +3,7 @@
 
 iproute2_depend()
 {
-	local x
+	program ip
-	x=$(_which ip)
-	[ -z "$x" ] && return 1
-	program $x
 	provide interface
 	after ifconfig
 }

net/macchanger.sh

@@ -4,6 +4,7 @@
 macchanger_depend()
 {
 	before macnet
+	# no program 'macchanger', as we have partial functionality without it
 }
 
 _config_vars="$_config_vars mac"

net/macvlan.sh

@@ -5,10 +5,7 @@
 
 macvlan_depend()
 {
-	local x
+	program ip
-	x=$(_which ip)
-	[ -z "${X}" ] && return 1
-	program $x
 	after interface
 	before dhcp macchanger
 }

net/tuntap.sh

@@ -4,6 +4,7 @@
 tuntap_depend()
 {
 	before bridge interface macchanger
+	program ip openvpn tunctl
 }
 
 _config_vars="$_config_vars iproute2 openvpn tunctl"

net/vlan.sh

@@ -3,10 +3,7 @@
 
 vlan_depend()
 {
-	local x
+	program ip
-	x=$(_which ip)
-	[ -z "$x" ] && return 1
-	program $x
 	after interface
 	before dhcp
 }