diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-04-22 00:01:34 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-04-22 00:02:12 -0500 |
| commit | c9d581660186a18dfad03ebe95d2031a26fbf7c5 (patch) | |
| tree | 6a17d65afed51ce01d11c36105adce078b310e43 /src | |
| parent | 5ec656994b4b2a771de0c6775e37ecf45f4c6e38 (diff) | |
| download | pfsense-c9d581660186a18dfad03ebe95d2031a26fbf7c5.zip pfsense-c9d581660186a18dfad03ebe95d2031a26fbf7c5.tar.gz | |
Update VIPs CARP parent on upgrade. Ticket #6164
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.default/config.xml | 2 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 31dc971..f9fcdbd 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>15.2</version> + <version>15.3</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index d7e2b32..d9e6a19 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" => "15.2", + "latest_config" => "15.3", "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 08bd110..b0e110f 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4904,4 +4904,20 @@ function upgrade_151_to_152() { install_cron_job("/etc/rc.backup_dhcpleases.sh", false); } } + +function upgrade_152_to_153() { + global $config; + + if (is_array($config['virtualip']['vip'])) { + foreach ($config['virtualip']['vip'] as $idx => $vip) { + if (substr($vip['interface'], 0, 4) == "_vip") { + // using new VIP format + continue; + } else if (strstr($vip['interface'], "_vip")) { + // using old VIP format, update + $config['virtualip']['vip'][$idx]['interface'] = get_vip_from_oldcarp($vip['interface']); + } + } + } +} ?> |
