From 80124a050c626584f19fbac917276946224bcde7 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 1 Nov 2007 22:25:53 +0000 Subject: Work cleanly with bridges on kernels without TCP, #197791. --- sh/net.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sh') diff --git a/sh/net.sh b/sh/net.sh index 6c9dd6d9..71017bfc 100755 --- a/sh/net.sh +++ b/sh/net.sh @@ -349,7 +349,7 @@ _load_config() { local fallback="$(_get_array fallback_${IFVAR})" if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ] ; then - config="127.0.0.1/8 + [ "${config}" != "null" ] && config="127.0.0.1/8 ${config}" else if [ -z "${config}" ] ; then @@ -495,9 +495,11 @@ start() { local hidefirstroute=false first=true local routes="$(_get_array "routes_${IFVAR}")" if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ] ; then - routes="127.0.0.0/8 via 127.0.0.1 + if [ "${config_0}" != "null" ]; then + routes="127.0.0.0/8 via 127.0.0.1 ${routes}" - hidefirstroute=true + hidefirstroute=true + fi fi local IFS="$__IFS" for cmd in ${routes}; do -- cgit v1.2.3