diff options
| author | NewEraCracker <neweracracker@gmail.com> | 2016-05-11 21:49:43 +0100 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-05-11 17:07:27 -0500 |
| commit | 807e3bfc17b191dfb7a897e8f1bd279f8d21ca2f (patch) | |
| tree | 5ae9ca9ffe61b290bfb63fb214fc18989a9b7c42 | |
| parent | 6c6e8e3407b83812c9f3c7a349907816fbf54f99 (diff) | |
| download | pfsense-807e3bfc17b191dfb7a897e8f1bd279f8d21ca2f.zip pfsense-807e3bfc17b191dfb7a897e8f1bd279f8d21ca2f.tar.gz | |
Tweak upgrade - Remove unused code and document changes better
This will ensure a smooth upgrade for those running config 15.4 to any next version.
| -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, 9 insertions, 11 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 f270959..1c2b818 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -3487,8 +3487,8 @@ function upgrade_104_to_105() { } function upgrade_105_to_106() { - - /* NOTE: This entry can be reused for something else since the upgrade code was reverted */ + /* NOTE: This upgrade code was reverted. See redmine ticket #3967 and + https://github.com/pfsense/pfsense/commit/6f55af1c25f5232ffe905a90f5f97aad4c87bdfa */ } function upgrade_106_to_107() { @@ -4770,13 +4770,6 @@ function upgrade_147_to_148() { // Ensure there are no spaces in group names by // replacing spaces with underscores if (is_array($config['system']['group'])) { - $exgrps = array(); - - // Make a list of the existing group names so we can check for dups - foreach ($config['system']['group'] as $grp) { - $exgrps[] = $grp['name']; - } - $cleargroups = false; foreach ($config['system']['group'] as $idx => $grp) { if (strstr($grp['name'], " ")) { @@ -4982,4 +4975,9 @@ function upgrade_152_to_153() { } } } + +function upgrade_153_to_154() { + /* NOTE: This upgrade code was reverted. See redmine ticket #6118 and + https://github.com/pfsense/pfsense/commit/538a3c04a6b6671151e913b06b2f340b6f8ee222 */ +} ?> |
