Skip to content

Commit

Permalink
Revert "Rather do a fix by going through vips in reverse order"
Browse files Browse the repository at this point in the history
This reverts commit d996dfe.
  • Loading branch information
efonne committed May 23, 2012
1 parent d01de40 commit fe47f1f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions etc/inc/upgrade_config.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2799,11 +2799,8 @@ function upgrade_085_to_086() {
foreach ($config['virtualips']['vip'] as $vip) {
if ($vip['mode'] != "carp")
continue;
$vipchg[$vip['vhid']] = $vip;
}
ksort($vipchg);
foreach (array_reverse($vipchg) 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);
Expand Down

0 comments on commit fe47f1f

Please sign in to comment.