diff options
author | Ermal <eri@pfsense.org> | 2014-02-17 09:59:28 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2014-02-17 09:59:28 +0000 |
commit | eae913048438b87b49606498b23aa334447a3d5a (patch) | |
tree | 6148077e868ff3a9f4ef61b6e8cccef4b12aacd2 /etc/inc/upgrade_config.inc | |
parent | bd369bcfb4499cc91f7de090dbe67daefc635f64 (diff) | |
download | pfsense-eae913048438b87b49606498b23aa334447a3d5a.zip pfsense-eae913048438b87b49606498b23aa334447a3d5a.tar.gz |
Merge 10 -> 10.1 and 10.1 -> 10.2 function upgrade since the recent changes done on 2.1.1 for Ticket #3441
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 088a672..db33e1c 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3163,7 +3163,7 @@ function upgrade_099_to_100() { install_cron_job("/usr/bin/nice -n20 newsyslog", false); } -function upgrade_100_to_101() { +function upgrade_101_to_102() { global $config, $g; if (!is_array($config['captiveportal'])) @@ -3176,11 +3176,8 @@ function upgrade_100_to_101() { foreach ($cp['passthrumac'] as $idx => $passthrumac) $config['captiveportal'][$cpzone]['passthrumac'][$idx]['action'] = 'pass'; } -} -/* Convert OpenVPN Compression option to the new style */ -function upgrade_101_to_102() { - global $config; + /* Convert OpenVPN Compression option to the new style */ // Nothing to do if there is no OpenVPN tag if (!isset($config['openvpn']) || !is_array($config['openvpn'])) return; |