diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2010-05-06 11:06:21 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2010-05-06 11:06:21 +0200 |
| commit | 92a2ceae1182f47d2a45ce9a98be888bd4cddf67 (patch) | |
| tree | 640358e0f742a4f21d3d970c76f3303a08eb960a /etc | |
| parent | 0167a9bff5bafa7428ca2f4fdd85f5eabe25144c (diff) | |
| download | pfsense-92a2ceae1182f47d2a45ce9a98be888bd4cddf67.zip pfsense-92a2ceae1182f47d2a45ce9a98be888bd4cddf67.tar.gz | |
Do not trip with configuration upgrades on a empty load balancer tag.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index d2b33f7..fcecc51 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -1602,9 +1602,10 @@ function upgrade_053_to_054() { } // Unset lbpool if we no longer have any server pools if (count($lbpool_srv_arr) == 0) { - unset($config['load_balancer']['lbpool']); if(count($config['load_balancer']) == 0) { unset($config['load_balancer']); + } else { + unset($config['load_balancer']['lbpool']); } } else { $config['load_balancer']['lbpool'] = $lbpool_srv_arr; |
