diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-09-06 13:58:49 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-09-06 13:59:05 -0300 |
| commit | 279c2f425ed41104b41ff4438b291c9a6d4da49c (patch) | |
| tree | 3615df951e279ce371ae11ce143738a22455cfcb | |
| parent | da95bdcd9202e0f240099af3bfdf284b8f404d9f (diff) | |
| download | pfsense-279c2f425ed41104b41ff4438b291c9a6d4da49c.zip pfsense-279c2f425ed41104b41ff4438b291c9a6d4da49c.tar.gz | |
Disable kill_states by default on upgrade, it fixes #3183
| -rw-r--r-- | conf.default/config.xml | 2 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index 0ba4e75..2996d34 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- pfSense default system configuration --> <pfsense> - <version>9.6</version> + <version>9.8</version> <lastchange></lastchange> <theme>pfsense_ng</theme> <sysctl> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 3d571c6..0af789d 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -72,7 +72,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "9.7", + "latest_config" => "9.8", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 569dd3a..8093ff3 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3136,4 +3136,10 @@ function upgrade_096_to_097() { $config['syslog']['nologprivatenets'] = true; } } + +function upgrade_097_to_098() { + global $config, $g; + /* Disable kill_states by default */ + $config['system']['kill_states'] = true; +} ?> |
