diff options
author | Renato Botelho <garga@FreeBSD.org> | 2015-03-06 11:28:40 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2015-03-06 11:30:54 -0300 |
commit | edf370e7e07a0d2120598760e55fcfc6a22d3249 (patch) | |
tree | 942f67c1a739f39f886ac0fa3feed9d1f671b75d | |
parent | 99572c5380adcdb7cd040403b12a44247a13285e (diff) | |
download | pfsense-edf370e7e07a0d2120598760e55fcfc6a22d3249.zip pfsense-edf370e7e07a0d2120598760e55fcfc6a22d3249.tar.gz |
dns_split was a comma separated list and moved to use space as separator, provide upgrade code to make sure old configs are converted. Since there was a config upgrade version 11.7 only on master, I pushed it to 11.8 and used dns_split one as 11.7 to be able to backport it to RELENG_2_2. Ticket #4418
-rw-r--r-- | conf.default/config.xml | 2 | ||||
-rw-r--r-- | etc/inc/globals.inc | 2 | ||||
-rw-r--r-- | etc/inc/upgrade_config.inc | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index d79c3f6..46afa50 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>11.6</version> + <version>11.7</version> <lastchange/> <theme>pfsense_ng</theme> <system> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 05eee58..8505a9d 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -73,7 +73,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "11.6", + "latest_config" => "11.7", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 77423ca..4e5bcbd 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3552,4 +3552,17 @@ function upgrade_115_to_116() { } } +function upgrade_116_to_117() { + global $config; + + if (!isset($config['ipsec']['client']) || + !isset($config['ipsec']['client']['dns_split']) || + empty($config['ipsec']['client']['dns_split'])) { + return; + } + + $config['ipsec']['client']['dns_split'] = + preg_replace('/\s*,\s*/', ' ', trim($config['ipsec']['client']['dns_split'])); +} + ?> |