diff options
| author | smos <seth.mos@dds.nl> | 2011-02-23 15:19:27 +0100 |
|---|---|---|
| committer | smos <seth.mos@dds.nl> | 2011-02-23 15:19:27 +0100 |
| commit | 443f2e6e7804a6ac9f5f65240bb330a9182bb911 (patch) | |
| tree | 6218e8ed02c842ec6407bfb5ba71f478662cb72d /etc | |
| parent | 3d0397011cbc467982950400ac3e5b5a0cd93eff (diff) | |
| download | pfsense-443f2e6e7804a6ac9f5f65240bb330a9182bb911.zip pfsense-443f2e6e7804a6ac9f5f65240bb330a9182bb911.tar.gz | |
Attempted fix that should convert the old carp[$i] naming to vip[$vhid]
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index cc8042a..b5a8a60 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -918,6 +918,11 @@ function upgrade_046_to_047() { if (isset($tunnel['disabled'])) $ph1ent['disabled'] = $tunnel['disabled']; + /* convert to the new vip[$vhid] name */ + if(preg_match("/^carp/", $tunnel['interface'])) { + $carpid = substr($tunnel['interface'], 5); + $tunnel['interface'] = "vip" . $config['virtualip'][$carpid]['vhid']; + } $ph1ent['interface'] = $tunnel['interface']; $ph1ent['remote-gateway'] = $tunnel['remote-gateway']; $ph1ent['descr'] = $tunnel['descr']; |
