diff options
| author | jim-p <jimp@pfsense.org> | 2016-07-11 12:42:56 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-07-11 12:42:56 -0400 |
| commit | b9087e1d7a8d25c34e2b5ce1336ff552bfb256ae (patch) | |
| tree | b2dff783c8a35e600ca58e1a0c6f32716584819d | |
| parent | ab28a01043fa2dfe018de521af53ca48982757bc (diff) | |
| download | pfsense-b9087e1d7a8d25c34e2b5ce1336ff552bfb256ae.zip pfsense-b9087e1d7a8d25c34e2b5ce1336ff552bfb256ae.tar.gz | |
Add upgrade code to clean up the old GRE/GIF flags that are no longer used. Ticket #6586 and Ticket #6587
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 1d5aa28..e8f7391 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.4", + "latest_config" => "15.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 c126e3e..52aa482 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4980,4 +4980,28 @@ function upgrade_153_to_154() { /* NOTE: This upgrade code was reverted. See redmine ticket #6118 and https://github.com/pfsense/pfsense/commit/538a3c04a6b6671151e913b06b2f340b6f8ee222 */ } + +/* Clean up old GRE/GIF options. See Redmine tickets #6586 and #6587 */ +function upgrade_154_to_155() { + global $config; + + if (is_array($config['gifs']['gif'])) { + foreach ($config['gifs']['gif'] as $idx => $gif) { + if (isset($gif['link0'])) { + unset($config['gifs']['gif'][$idx]['link0']); + } + } + } + + if (is_array($config['gres']['gre'])) { + foreach ($config['gres']['gre'] as $idx => $gre) { + if (isset($gre['link0'])) { + unset($config['gres']['gre'][$idx]['link0']); + } + if (isset($gre['link2'])) { + unset($config['gres']['gre'][$idx]['link2']); + } + } + } +} ?> |
