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:28:40 -0300 |
| commit | 877740eed5c70124c86281b24e8709ae734934a6 (patch) | |
| tree | 973203b51389bf8dc7f065d0810d030078400d7c /etc | |
| parent | 277810659aa80c7a8f30a35e1575a7796007ce51 (diff) | |
| download | pfsense-877740eed5c70124c86281b24e8709ae734934a6.zip pfsense-877740eed5c70124c86281b24e8709ae734934a6.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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 3e6d13d..caf06ae 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.7", + "latest_config" => "11.8", "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 89bef33..bdba3eb 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3738,6 +3738,19 @@ 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'])); +} + +function upgrade_117_to_118() { + global $config; + if (!isset($config['installedpackages']['miniupnpd']['config'][0])) { return; } |
