From d30bbdd730e0fb86d913c3ab5cd529d83220a685 Mon Sep 17 00:00:00 2001
From: Seth Mos <seth.mos@xs4all.nl>
Date: Mon, 21 Dec 2009 09:52:49 +0100
Subject: Make sure we test for the right gateway name in the upgrade code.

---
 etc/inc/upgrade_config.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 7f7b404..24a104f 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1549,8 +1549,9 @@ function upgrade_053_to_054() {
 					$split = split("\|", $member);
 					$interface = $split[0];
 					/* on static upgraded configuration we automatically append _GW */
-					if(is_array($gateways['{$interface}_GW'])) {
-						$interface = strtoupper($interface) . "_GW";
+					$static_name = strtoupper($ifname) . "_GW";
+					if(is_array($gateways[$static_name])) {
+						$interface = $static_name;
 					}
 					$monitor = $split[1];
 					/* on failover increment tier. Else always assign 1 */
-- 
cgit v1.1