From 15660dbbfcbf8eace589a3284130036b481c1cdf Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sat, 9 Apr 2011 13:54:01 -0500 Subject: add fallback_routes support to network scripts Add support for optional fallback_routes_* variables in the network scripts. This is similar to the fallback_route_* support in baselayout-1. However, if you do not have fallback_routes set for an interface but you do have routes set, that setting will be used, so you do not need this variable unless you want the fallback routes to be different from the primary routes. X-Gentoo-Bug: 250978 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=250978 --- init.d/net.lo.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'init.d') diff --git a/init.d/net.lo.in b/init.d/net.lo.in index 822e3f5..8f4ea9b 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -476,7 +476,7 @@ interface_down() start() { - local IFACE=${RC_SVCNAME#*.} oneworked=false module= + local IFACE=${RC_SVCNAME#*.} oneworked=false fallback=false module= local IFVAR=$(shell_var "${IFACE}") cmd= our_metric= local metric=0 @@ -563,6 +563,7 @@ start() else eval config=\$fallback_${config_index} if [ -n "${config}" ]; then + fallback=true eoutdent ewarn "Trying fallback configuration ${config}" eindent @@ -585,8 +586,13 @@ start() return 1 fi - local hidefirstroute=false first=true - local routes="$(_get_array "routes_${IFVAR}")" + local hidefirstroute=false first=true routes= + if ${fallback}; then + routes="$(_get_array "fallback_routes_${IFVAR}")" + fi + if [ -z "${routes}" ]; then + routes="$(_get_array "routes_${IFVAR}")" + fi if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then if [ "${config_0}" != "null" ]; then routes="127.0.0.0/8 via 127.0.0.1 -- cgit v1.2.3