diff options
| author | gnhb <gnoahb@gmail.com> | 2011-02-24 00:06:05 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2011-02-24 00:06:05 +0700 |
| commit | ec465066251a9e27549cb05a9da5ee9d77ecde2b (patch) | |
| tree | cf200fedc78a64ab6c60bc1601470daa8d5cb139 /etc | |
| parent | d9cc4b24d09c04dc2a1974ab8da8e564f7462e36 (diff) | |
| parent | 4aa58d46e16853e45bc2470a0e49a8ecbb55698b (diff) | |
| download | pfsense-ec465066251a9e27549cb05a9da5ee9d77ecde2b.zip pfsense-ec465066251a9e27549cb05a9da5ee9d77ecde2b.tar.gz | |
Merge branch 'master' of rcs.pfsense.org:pfsense/mainline
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 14 | ||||
| -rwxr-xr-x | etc/rc.shutdown | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index b5c492a..8bb2c77 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -820,15 +820,16 @@ function upgrade_044_to_045() { global $config; $iflist = get_configured_interface_list(false, true); if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) { + $i = 0; foreach ($config['vlans']['vlan'] as $id => $vlan) { - $config['vlans']['vlan'][$id]['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}"; + $config['vlans']['vlan'][$i]['vlanif'] = "{$vlan['if']}_vlan{$vlan['tag']}"; /* Make sure to update the interfaces section with the right name */ foreach($iflist as $ifname) { - if($config['interfaces'][$ifname]['if'] == "vlan{$id}") { + if($config['interfaces'][$ifname]['if'] == "vlan{$i}") { $config['interfaces'][$ifname]['if'] = $vlan['vlanif']; } } - + $i++; } } } @@ -917,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']['vip'][$carpid]['vhid']; + } $ph1ent['interface'] = $tunnel['interface']; $ph1ent['remote-gateway'] = $tunnel['remote-gateway']; $ph1ent['descr'] = $tunnel['descr']; @@ -1681,7 +1687,7 @@ function upgrade_053_to_054() { } else { $i = 1; } - $gateway_group['item'][] = "$interface|$i"; + $gateway_group['item'][] = "$static_name|$i"; } $gateway_group_arr[] = $gateway_group; } else { diff --git a/etc/rc.shutdown b/etc/rc.shutdown index 9d46ad2..a4b2530 100755 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -28,7 +28,7 @@ export PATH # temporary files on shutdown from /tmp/ PLATFORM=`cat /etc/platform` if [ "$PLATFORM" = "pfSense" ]; then - rm -rf /tmp/* + find -xdev /tmp/ -exec rm -rf {} else /etc/rc.backup_rrd.sh /etc/rc.backup_dhcpleases.sh |
