summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-11-10 14:20:18 (GMT)
committerErmal <eri@pfsense.org>2014-11-10 14:20:18 (GMT)
commit6f55af1c25f5232ffe905a90f5f97aad4c87bdfa (patch)
tree1bef11a71e6c8a2a89cec909d9a540755112c74b
parentb0d054ca3b314d0ac7dcfd6a5ba30170a71fe63b (diff)
downloadunivnautes-6f55af1c25f5232ffe905a90f5f97aad4c87bdfa.zip
univnautes-6f55af1c25f5232ffe905a90f5f97aad4c87bdfa.tar.gz
univnautes-6f55af1c25f5232ffe905a90f5f97aad4c87bdfa.tar.bz2
Ticket 3967, revert upgrade code. Existing 2.2 installs might be impacted
-rw-r--r--etc/inc/upgrade_config.inc24
1 files changed, 1 insertions, 23 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index ab8a0c4..83dcb5b 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3282,30 +3282,8 @@ function upgrade_104_to_105() {
}
function upgrade_105_to_106() {
- global $config;
- if (is_array($config['virtualip']) && is_array($config['virtualip']['vip'])) {
- foreach ($config['virtualip']['vip'] as $vipidx => $vip) {
- if ($vip['mode'] == "ipalias" && strstr($vip['interface'], "_vip")) {
- /* Convert to a carp with same properties as its carp version */
- $converted = false;
- foreach ($config['virtualip']['vip'] as $bvip) {
- if ($bvip['mode'] == "carp" && "{$bvip['interface']}_vip{$bvip['vhid']}" == $vip['interface']) {
- $ipaaddr = $vip['subnet'];
- $ipamask = $vip['subnet_bits'];
- $config['virtualip']['vip'][$vipidx] = $bvip;
- $config['virtualip']['vip'][$vipidx]['subnet'] = $ipaaddr;
- $config['virtualip']['vip'][$vipidx]['subnet_bits'] = $ipamask;
- $converted = true;
- break;
- }
- }
- if ($converted === false)
- log_error("WARNING: IPalias {$vip['subnet']}/{$vip['subnet_bits']} was not completed successfully. Upgrading it yourself is the only remaining option!");
- }
- }
- unset($vip, $bvip, $vipidx);
- }
+ /* NOTE: This entry can be reused for something else since the upgrade code was reverted */
}
function upgrade_106_to_107() {