diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-06 10:14:33 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-06 10:14:33 -0200 |
| commit | 3dd6ce64c1479a56845cba6644aad62103aa4694 (patch) | |
| tree | ec6040bd66723b1d716f5a476fae7510f1b31054 | |
| parent | 71bafaa6f4dafb19e8a674322328048f9ef08df3 (diff) | |
| parent | e030050ddbd11e882722fb65c449267c13026a4e (diff) | |
| download | pfsense-3dd6ce64c1479a56845cba6644aad62103aa4694.zip pfsense-3dd6ce64c1479a56845cba6644aad62103aa4694.tar.gz | |
Merge pull request #3252 from phil-davis/unset_glxsb
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 76c6aa7..49f5c95 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -65,7 +65,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "15.8", + "latest_config" => "15.9", "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", "wan_interface_name" => "wan", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 842ec0e..b0aa404 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4971,11 +4971,8 @@ function upgrade_154_to_155() { } } -/* Unset references to glxsb in the config. See #6755 */ function upgrade_155_to_156() { - if ($config['system']['crypto_hardware'] == "glxsb") { - unset($config['system']['crypto_hardware']); - } + // Unused } function upgrade_156_to_157() { @@ -5028,4 +5025,13 @@ function upgrade_157_to_158() { } } +/* Unset references to glxsb in the config. See #6755 */ +function upgrade_158_to_159() { + global $config; + + if ($config['system']['crypto_hardware'] == "glxsb") { + unset($config['system']['crypto_hardware']); + } +} + ?> |
