VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-19 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow bridge over VLAN, and always ifdown before ifup (thanks to Caspar Smit)

Browse Source
This commit is contained in:
Jamie Cameron
2014-02-04 13:30:34 -08:00
parent 9c1e7c1198
commit dc75902be8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/linux-lib.pl
View File

@ -105,7 +105,7 @@ if (&use_ifup_command($a)) {
} }
else { $cmd .= "ifdown $a->{'physical'}" . "." . $a->{'vlanid'}; } else { $cmd .= "ifdown $a->{'physical'}" . "." . $a->{'vlanid'}; }
} }
elsif ($a->{'up'}) { $cmd .= "ifup $a->{'fullname'}"; } elsif ($a->{'up'}) { $cmd .= "ifdown $a->{'fullname'}\; ifup $a->{'fullname'}"; }
else { $cmd .= "ifdown $a->{'fullname'}"; } else { $cmd .= "ifdown $a->{'fullname'}"; }
} }
else { else {

2
net/save_bifc.cgi
View File

@ -299,7 +299,7 @@ else {
# Save bridge settings # Save bridge settings
if ($b->{'bridge'}) { if ($b->{'bridge'}) {
if ($in{'bridgeto'}) { if ($in{'bridgeto'}) {
$in{'bridgeto'} =~ /^eth\d+$/ || ($in{'bridgeto'} =~ /^eth\d+$/ || $in{'bridgeto'} =~ /^eth\d+.\d+$/) ||
&error($text{'bifc_ebridgeto'}); &error($text{'bifc_ebridgeto'});
($bt) = grep { $_->{'fullname'} eq $in{'bridgeto'} } ($bt) = grep { $_->{'fullname'} eq $in{'bridgeto'} }
@boot; @boot;