diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-25 18:22:03 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-25 18:22:03 -0600 |
| commit | a34c263bef2152eb4bc5dd27c8393a7fdb27b4fb (patch) | |
| tree | ecbb3bbd6e19a1c1cf7a2335bf5694036d22bc87 | |
| parent | 3756fd860385c98a890e3b8315bf50448095c3bb (diff) | |
| download | pfsense-a34c263bef2152eb4bc5dd27c8393a7fdb27b4fb.zip pfsense-a34c263bef2152eb4bc5dd27c8393a7fdb27b4fb.tar.gz | |
Add uniqid tag to CARP VIPs that don't have one upon upgrade. Ticket #4858
| -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 | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 1af76bb..937f0d0 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>13.9</version> + <version>14.0</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 91fc0ee..c0b2203 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" => "13.9", + "latest_config" => "14.0", "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 5a5425d..11baf48 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4337,4 +4337,18 @@ function upgrade_138_to_139() { } } +function upgrade_139_to_140() { + global $config; + + if (is_array($config['virtualip']['vip'])) { + foreach ($config['virtualip']['vip'] as $idx => $vip) { + if ($vip['mode'] == "carp") { + if (!isset($vip['uniqid'])) { + $config['virtualip']['vip'][$idx]['uniqid'] = uniqid(); + } + } + } + } +} + ?> |
