diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-05-11 00:29:58 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-05-11 00:29:58 -0500 |
| commit | 538a3c04a6b6671151e913b06b2f340b6f8ee222 (patch) | |
| tree | 17de24816735bff77523d5b8dd4d5bb9395f4651 | |
| parent | 381b8f1cd59149cc654d829f2f4c7344149ca786 (diff) | |
| download | pfsense-538a3c04a6b6671151e913b06b2f340b6f8ee222.zip pfsense-538a3c04a6b6671151e913b06b2f340b6f8ee222.tar.gz | |
Revert "Add config upgrade code to update package names. Ticket #6118"
This reverts commit 291fad43870bdb39ef0ab32125b022e268a29cf7.
| -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, 2 insertions, 15 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 98afef1..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.4</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 221df9e..fa4d5dc 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.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 cf29079..f270959 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4982,17 +4982,4 @@ 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']]; - } - } - } -} ?> |
