diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-06-08 22:14:34 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-06-08 22:14:34 +0000 |
| commit | e1c449c0362c89b1d7c4ab2a1a860e88938cfcde (patch) | |
| tree | 86cae093b6bad3bcbd9f13c3042b78da7fe31ae4 /etc/inc/config.inc | |
| parent | 83bdca55920ca6ab3d848f0993d57a1f9b85098f (diff) | |
| download | pfsense-e1c449c0362c89b1d7c4ab2a1a860e88938cfcde.zip pfsense-e1c449c0362c89b1d7c4ab2a1a860e88938cfcde.tar.gz | |
Revert "Do not use tags for vlan interface names since there might be same vlan tags on different parent interfaces and this will break configs and will hide the reason it does not work. Thanks-to: smos@"
This reverts commit 83bdca55920ca6ab3d848f0993d57a1f9b85098f.
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 5d8661a..6dd751d 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -810,12 +810,12 @@ EOD; if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) { echo "\n\nVLAN interfaces:\n\n"; - foreach ($config['vlans']['vlan'] as $vlanid => $vlan) { + foreach ($config['vlans']['vlan'] as $vlan) { - echo sprintf("% -8s%s\n", "vlan{$vlanid}", + echo sprintf("% -8s%s\n", "vlan{$vlan['tag']}", "VLAN tag {$vlan['tag']}, interface {$vlan['if']}"); - $iflist['vlan' . $vlanid] = array(); + $iflist['vlan' . $vlan['tag']] = array(); } } @@ -1146,7 +1146,7 @@ EOD; echo "Enter the VLAN tag (1-4094): "; $vlan['tag'] = chop(fgets($fp)); - $vlan['vlanif'] = "vlan{$vlanif}"; + $vlan['vlanif'] = "vlan{$vlan['tag']}"; if (!is_numericint($vlan['tag']) || ($vlan['tag'] < 1) || ($vlan['tag'] > 4094)) { echo "\nInvalid VLAN tag '{$vlan['tag']}'\n"; continue; |
