summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/upgrade_config.inc
diff options
context:
space:
mode:
Diffstat (limited to 'src/etc/inc/upgrade_config.inc')
-rw-r--r--src/etc/inc/upgrade_config.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 45cc76c..6867522 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4119,6 +4119,14 @@ function upgrade_128_to_129() {
/* IPSEC is always on in 2.3. */
if (isset($config['ipsec']['enable'])) {
unset($config['ipsec']['enable']);
+ } else if (is_array($config['ipsec']['phase1'])) {
+ /*
+ * If IPsec was globally disabled, disable all
+ * phase1 entries
+ */
+ foreach ($config['ipsec']['phase1'] as $idx => $p1) {
+ $config['ipsec']['phase1'][$idx]['disabled'] = true;
+ }
}
}
OpenPOWER on IntegriCloud