mirror of
https://github.com/webmin/webmin.git
synced 2026-05-04 22:30:33 +01:00
Fix classification of ethernet interfaces
This commit is contained in:
@@ -288,7 +288,8 @@ if (($in{'new'} && $in{'virtual'} eq "" && !$in{'bridge'}) ||
|
||||
if ($in{'bridge'} || $b && $b->{'bridge'}) {
|
||||
@ethboot = sort { $a cmp $b }
|
||||
map { $_->{'fullname'} }
|
||||
grep { $_->{'fullname'} =~ /^(eth|vlan|bond)/ &&
|
||||
grep { ($_->{'fullname'} =~ /^(vlan|bond)/ ||
|
||||
&iface_type($_->{'fullname'}) eq 'Ethernet') &&
|
||||
$_->{'virtual'} eq '' } @boot;
|
||||
print &ui_table_row($text{'bifc_bridgeto'},
|
||||
&ui_select("bridgeto", $b->{'bridgeto'},
|
||||
|
||||
@@ -299,7 +299,7 @@ else {
|
||||
# Save bridge settings
|
||||
if ($b->{'bridge'}) {
|
||||
if ($in{'bridgeto'}) {
|
||||
($in{'bridgeto'} =~ /^eth\d+$/ || $in{'bridgeto'} =~ /^eth\d+.\d+$/) ||
|
||||
&iface_type($in{'bridgeto'}) eq 'Ethernet' ||
|
||||
&error($text{'bifc_ebridgeto'});
|
||||
($bt) = grep { $_->{'fullname'} eq $in{'bridgeto'} }
|
||||
@boot;
|
||||
|
||||
Reference in New Issue
Block a user