Move RRD upgrade code inline with 1.2

1 files changed, 9 insertions, 9 deletions

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 7f5c566..7857985 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -997,7 +997,14 @@ function convert_config() {
 		$config['version'] = "2.9";
 	}
 
-	/* Convert 2.9 -> 4.0 */
+	/* Convert 2.9 -> 3.0 */
+	if ($config['version'] <= 2.9) {
+		/* enable the rrd config setting by default */
+		$config['rrd']['enable'] = true;
+		$config['version'] = "3.0";
+	}
+
+	/* Convert 3.0 -> 4.0 */
 	if ($config['version'] <= 3.9) {
 		$config['system']['webgui']['auth_method'] = "session";
 		$config['system']['webgui']['backing_method'] = "htpasswd";
@@ -1127,13 +1134,6 @@ function convert_config() {
 
 	}
 
-	/* Convert 4.1 -> 4.2 */
-	if ($config['version'] <= 4.1) {
-		/* enable the rrd config setting by default */
-		$config['rrd']['enable'] = true;
-		$config['version'] = "4.2";
-	}
-
 	if ($prev_version != $config['version'])
 		write_config("Upgraded config version level from {$prev_version} to {$config['version']}");
 }
@@ -1979,4 +1979,4 @@ function set_device_perms() {
 if($g['booting']) echo ".";
 $config = parse_config();
 
-?>
\ No newline at end of file
+?>