diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2012-05-23 14:10:25 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2012-05-23 14:35:29 -0600 |
| commit | fe47f1f2019111dc1743be150f07990e1b501b72 (patch) | |
| tree | f5a0c419c8a576f8852e0429457644a9e6b50268 /etc/inc | |
| parent | d01de40fa6d6a05e03351f0ccd83c64f82a4a2e5 (diff) | |
| download | pfsense-fe47f1f2019111dc1743be150f07990e1b501b72.zip pfsense-fe47f1f2019111dc1743be150f07990e1b501b72.tar.gz | |
Revert "Rather do a fix by going through vips in reverse order"
This reverts commit d996dfeab2ec40cf3fb44b51811333b40ed5073f.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 0a71c5d..ed3fc45 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -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); |
