diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-02-20 02:04:25 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-02-20 02:04:25 -0600 |
| commit | 7c4c43a5224ad7e552999d6fc31faa1343ef246a (patch) | |
| tree | e20a4879184f2b5310107926d56137eb9172a279 /src/etc | |
| parent | 1c42c58554ab2f820cd74d35c8236952cd7fcb67 (diff) | |
| download | pfsense-7c4c43a5224ad7e552999d6fc31faa1343ef246a.zip pfsense-7c4c43a5224ad7e552999d6fc31faa1343ef246a.tar.gz | |
Add config upgrade code to enable and configure DHCPv6 server and radvd where track6 is in use, as they were automatically configured previously. Add same config to default config.xml to retain existing behavior there. Ticket #3029
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 8ab46d6..235e14d 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "14.4", + "latest_config" => "14.5", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 69e0df6..fd31a0a 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4567,4 +4567,25 @@ function upgrade_143_to_144() { } } +function upgrade_144_to_145() { + global $config; + + // Enable DHCPv6 server and radvd config for track6 interfaces, + // matching what used to be automatically enabled with no user + // configurability. + if (is_array($config['interfaces'])) { + foreach ($config['interfaces'] as $ifname => $ifcfg) { + if (isset($ifcfg['enable'])) { + if ($ifcfg['ipaddrv6'] == "track6") { + $config['dhcpdv6'][$ifname]['enable'] = true; + $config['dhcpdv6'][$ifname]['range']['from'] = "::1000"; + $config['dhcpdv6'][$ifname]['range']['to'] = "::2000"; + $config['dhcpdv6'][$ifname]['ramode'] = "assist"; + $config['dhcpdv6'][$ifname]['rapriority'] = "medium"; + } + } + } + } +} + ?> |
