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

Fix reference updating for when more than one carp vip exists. Skip the upgrade code if no carp vip defined. Ticket #2445

Browse Source
This commit is contained in:
Erik Fonnesbeck 2012-05-23 16:50:35 -06:00
parent 79f4bb0b50
commit e820da2a93
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/inc/upgrade_config.inc
View File

@ -2793,17 +2793,21 @@ function upgrade_085_to_086() {
global $config, $g;
/* XXX: Gross hacks in sight */
write_config();
if (is_array($config['virtualip']['vip'])) {
$vipchg = array();
foreach ($config['virtualip']['vip'] as $vip) {
if ($vip['mode'] != "carp")
continue;
file_put_contents("{$g['tmp_path']}/vipreplace", "s/\\([^_]\\)vip{$vip['vhid']}\\([^0-9]\\)/\\1{$vip['interface']}_vip{$vip['vhid']}\\2/g\n");
$vipchg[] = "s/\\([^_]\\)vip{$vip['vhid']}\\([^0-9]\\)/\\1{$vip['interface']}_vip{$vip['vhid']}\\2/g\n";
}
if (!empty($vipchg)) {
file_put_contents("{$g['tmp_path']}/vipreplace", $vipchg);
write_config();
mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml");
require_once("config.lib.inc");
$config = parse_config(true);
@unlink("{$g['tmp_path']}/vipreplace");
}
mwexec("/usr/bin/sed -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml");
require_once("config.lib.inc");
$config = parse_config(true);
}
}