From 208c43903878423ae26cea2a90605aa2be646b9e Mon Sep 17 00:00:00 2001
From: Colin Smith <colin@pfsense.org>
Date: Wed, 16 Mar 2005 02:17:46 +0000
Subject: Add conversion from config.xml versions 1.5 to 1.6 (properly handle
 new firmware directive).

---
 etc/inc/config.inc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 5ac1d39..7ef4d61 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -448,7 +448,20 @@ function convert_config() {
 	}
 
 	/* Convert 1.5 -> 1.6 */
+	if ($config['version'] == "1.5") {
+		/* Alternate firmware URL moved */
+		if (isset($config['system']['firmwareurl']) && isset($config['system']['firmwarename'])) { // Only convert if *both* are defined.
+			$config['system']['alt_firmware_url'] = array();
+			$config['system']['alt_firmware_url']['enabled'] = "";
+			$config['system']['alt_firmware_url']['firmware_base_url'] = $config['system']['firmwareurl'];
+			$config['system']['alt_firmware_url']['firmware_filename'] = $config['system']['firmwarename'];
+			unset($config['system']['firmwareurl'], $config['system']['firmwarename']);
+		} else {
+			unset($config['system']['firmwareurl'], $config['system']['firmwarename']);
+		}
 
+		$config['version'] = "1.6";
+	}
 
 	write_config();
 
-- 
cgit v1.1