diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2009-12-24 12:05:44 +0100 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2009-12-24 12:05:44 +0100 |
commit | d9d4c637830257d3572fcb73e97a0d10dc5682cf (patch) | |
tree | 0055b8e9486e8be5809635ba69c474fa8fa44c86 /etc/inc/upgrade_config.inc | |
parent | ec98a89d0dacb0b91bb8263a25616089c88683ce (diff) | |
download | pfsense-d9d4c637830257d3572fcb73e97a0d10dc5682cf.zip pfsense-d9d4c637830257d3572fcb73e97a0d10dc5682cf.tar.gz |
Reorder a few lines so we do not step on the interface variable. This was the cause of accidentaly adding gateway name entries in the
$config['interfaces'] xml
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 1410952..9716a6d 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1550,12 +1550,15 @@ function upgrade_053_to_054() { foreach($lbpool['servers'] as $member) { $split = split("\|", $member); $interface = $split[0]; + $monitor = $split[1]; + if(is_ipaddr($monitor)) { + $config['interfaces'][$interface]['monitorip'] = "$monitor"; + } /* on static upgraded configuration we automatically prepend GW_ */ $static_name = "GW_" . strtoupper($interface); if(is_array($gateways[$static_name])) { $interface = $static_name; } - $monitor = $split[1]; /* on failover increment tier. Else always assign 1 */ if($lbpool['behaviour'] == "failover") { $i++; @@ -1563,9 +1566,6 @@ function upgrade_053_to_054() { $i = 1; } $gateway_group['item'][] = "$interface|$i"; - if(is_ipaddr($monitor)) { - $config['interfaces'][$interface]['monitorip'] = "$monitor"; - } } $gateway_group_arr[] = $gateway_group; } else { |