From 47f21d06a07f7c1225886e50a05a06475daeedf2 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Mon, 17 Sep 2007 21:38:58 +0000
Subject: Fix fallback configurations

---
 sh/net.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'sh/net.sh')

diff --git a/sh/net.sh b/sh/net.sh
index 4a47c4e7..3be6a421 100755
--- a/sh/net.sh
+++ b/sh/net.sh
@@ -360,7 +360,7 @@ _load_config() {
 	eval config_${config_index}=
 
 	config_index=0
-	eval $(_get_array fallback_${IFVAR})
+	eval "$(_get_array fallback_${IFVAR})"
 	for cmd in "$@" ; do
 		eval fallback_${config_index}="'${cmd}'"
 		config_index=$((${config_index} + 1))
@@ -459,11 +459,13 @@ start() {
 		if eend $? ; then
 			oneworked=true
 		else
-			eval config=\$fallback_${IFVAR}
+			eval config=\$fallback_${config_index}
 			if [ -n "${config}" ] ; then
-				einfo "Trying fallback configuration"
-				eval config_${config_index}=\$fallback_${IFVAR}
-				eval fallback_${config_index}=
+				eoutdent
+				ewarn "Trying fallback configuration ${config}"
+				eindent
+				eval config_${config_index}=\$config
+				unset fallback_${config_index}
 				config_index=$((${config_index} - 1))
 			fi
 		fi
-- 
cgit v1.2.3