From 279c2f425ed41104b41ff4438b291c9a6d4da49c Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 6 Sep 2013 13:58:49 -0300
Subject: Disable kill_states by default on upgrade, it fixes #3183

---
 conf.default/config.xml    | 2 +-
 etc/inc/globals.inc        | 2 +-
 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;
+}
 ?>
-- 
cgit v1.1