diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-05-08 03:10:38 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-05-08 03:11:15 -0500 |
| commit | 297ace668e4a4ffbf1fb1581e7c765e2ed158e29 (patch) | |
| tree | 6c6d8e22c3a0d06a1330605698ff5327c6a4457f | |
| parent | d239edd157ec90fd04caad6ef35a3e32ae228c90 (diff) | |
| download | pfsense-297ace668e4a4ffbf1fb1581e7c765e2ed158e29.zip pfsense-297ace668e4a4ffbf1fb1581e7c765e2ed158e29.tar.gz | |
Add config upgrade code to update package names. Ticket #6118
| -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 | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index f9fcdbd..98afef1 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>15.3</version> + <version>15.4</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index fa4d5dc..221df9e 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.3", + "latest_config" => "15.4", "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 2a52979..df90e9a 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4978,4 +4978,17 @@ function upgrade_152_to_153() { } } } +function upgrade_153_to_154() { + global $config; + + // rename packages from 2.1.x + $rename_arr = array("Quagga OSPF" => "Quagga_OSPF", "System Patches" => "System_Patches"); + if (is_array($config['installedpackages']['package'])) { + foreach ($config['installedpackages']['package'] as $idx => $pkg) { + if (key_exists($pkg['name'], $rename_arr)) { + $config['installedpackages']['package'][$idx]['name'] == $rename_arr[$pkg['name']]; + } + } + } +} ?> |
