summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2009-12-21 09:52:49 +0100
committerSeth Mos <seth.mos@xs4all.nl>2009-12-21 09:53:17 +0100
commitd30bbdd730e0fb86d913c3ab5cd529d83220a685 (patch)
tree55157cb87cf11693934cca2888ecaa21c411b2bf
parentb4deddce0ac94ef6feda97c4231863399e7fda03 (diff)
downloadpfsense-d30bbdd730e0fb86d913c3ab5cd529d83220a685.zip
pfsense-d30bbdd730e0fb86d913c3ab5cd529d83220a685.tar.gz
Make sure we test for the right gateway name in the upgrade code.
-rw-r--r--etc/inc/upgrade_config.inc5
1 files 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 */
OpenPOWER on IntegriCloud