mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jim-p 2012-05-23 11:35:41 -04:00
parent 617244c7f7
commit b22fc82559
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/inc/globals.inc
View File

@ -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",

31
etc/inc/upgrade_config.inc
View File

@ -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);
}
}
?>