summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/config.inc7
-rw-r--r--etc/inc/globals.inc2
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 710efc2..cf26286 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -708,7 +708,12 @@ function convert_config() {
}
$config['version'] = "2.1";
}
-
+ /* Convert 2.1 -> 2.2 */
+ if ($config['version'] == "2.1") {
+ /* move gateway to wan interface */
+ $config['interfaces']['wan']['gateway'] = $config['system']['gateway'];
+ $config['version'] = "2.2";
+ }
if ($prev_version != $config['version'])
write_config("Upgraded config version level from {$prev_version} to {$config['version']}");
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index d1dd361..495524d 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -52,7 +52,7 @@ $g = array(
"n_pppoe_units" => 16, /* this value can be overriden in pppoe->n_pppoe_units */
"pppoe_subnet" => 28, /* this value can be overriden in pppoe->pppoe_subnet */
"debug" => false,
- "latest_config" => "2.1",
+ "latest_config" => "2.2",
"nopkg_platforms" => array("cdrom"),
"nopccard_platforms" => array("wrap", "net48xx"),
"xmlrpcbaseurl" => "www.pfsense.com",
OpenPOWER on IntegriCloud