diff options
| author | jim-p <jimp@pfsense.org> | 2012-05-08 18:21:50 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-05-08 18:22:12 -0400 |
| commit | 30274157b2361f0fac14f0eaa86ae08dc02678a7 (patch) | |
| tree | 8ff7de6cb0087db653ca09999c267f4619c4c0b7 /etc/inc/upgrade_config.inc | |
| parent | 8a4b381f579a8b5ee67aab4c4f3964cdc64fec92 (diff) | |
| download | pfsense-30274157b2361f0fac14f0eaa86ae08dc02678a7.zip pfsense-30274157b2361f0fac14f0eaa86ae08dc02678a7.tar.gz | |
Revert "Make vips vhid be unique per parent interface!" - per cmb, this should not have been on RELENG_2_0 see ticket #2415
This reverts commit 4d0c032c528b10221a2ef894b5eca34f6fda39a7.
Conflicts:
etc/inc/openvpn.inc
etc/inc/upgrade_config.inc
etc/rc.filter_synchronize
Diffstat (limited to 'etc/inc/upgrade_config.inc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 0eee712..9959f10 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2638,22 +2638,4 @@ function upgrade_079_to_080() { unset($config['system']['username']); } } - -function upgrade_080_to_081() { - global $config, $g; - - /* XXX: Gross hacks in sight */ - write_config(); - if (is_array($config['virtualips']['vip'])) { - $vipchg = array(); - foreach ($config['virtualips']['vip'] as $vip) { - $realif = get_real_interface($vip['interface']); - file_put_contents("{$g['tmp_path']}/vipreplace", "s/vip{$vip['vhid']}/{$realif}_vip{$vip['vhid']}/g\n"); - } - mwexec("/bin/sh -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml"); - require_once("config.lib.inc"); - $config = parse_config(true); - } -} - ?> |
