diff options
| author | jim-p <jimp@pfsense.org> | 2012-05-23 11:35:41 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-05-23 11:35:41 -0400 |
| commit | b22fc825595effaaa7973775b08d86a4cf68f953 (patch) | |
| tree | 9668411f01b47fef11cbcff286fb3fd75016e892 | |
| parent | 617244c7f7940dbce4065d196a524a708e24c918 (diff) | |
| download | pfsense-b22fc825595effaaa7973775b08d86a4cf68f953.zip pfsense-b22fc825595effaaa7973775b08d86a4cf68f953.tar.gz | |
Move vip upgrade code to be later, since it was backed out of 2.0.x it no longer needs to be so early, and otherwise there can be some breakage/fallout. Ticket #2445
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 31 |
2 files changed, 17 insertions, 16 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index c870828..1d85e1e 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -77,7 +77,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "http://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "8.5", + "latest_config" => "8.6", "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 314ab2b..34fbdd6 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2712,26 +2712,11 @@ function upgrade_081_to_082() { global $config, $g; /* enable the allow IPv6 toggle */ $config['system']['ipv6allow'] = true; - - /* XXX: Gross hacks in sight */ - write_config(); - if (is_array($config['virtualips']['vip'])) { - $vipchg = array(); - foreach ($config['virtualips']['vip'] as $vip) { - file_put_contents("{$g['tmp_path']}/vipreplace", "s/vip{$vip['vhid']}/{$vip['interface']}_vip{$vip['vhid']}/g\n"); - } - mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml"); - require_once("config.lib.inc"); - $config = parse_config(true); - } } function upgrade_082_to_083() { global $config; - /* enable the allow IPv6 toggle if coming from 2.0.x where x > 1 */ - $config['system']['ipv6allow'] = true; - /* Upgrade captiveportal config */ if (!empty($config['captiveportal'])) { $tmpcp = $config['captiveportal']; @@ -2804,4 +2789,20 @@ function upgrade_084_to_085() { } } +function upgrade_085_to_086() { + global $config; + + /* XXX: Gross hacks in sight */ + write_config(); + if (is_array($config['virtualips']['vip'])) { + $vipchg = array(); + foreach ($config['virtualips']['vip'] as $vip) { + file_put_contents("{$g['tmp_path']}/vipreplace", "s/vip{$vip['vhid']}/{$vip['interface']}_vip{$vip['vhid']}/g\n"); + } + mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml"); + require_once("config.lib.inc"); + $config = parse_config(true); + } +} + ?> |
