X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FNetwork.pm;h=71af2b889bbbd6da5ce6651581c6197bf531935d;hb=21c56a963f6bdcb8cd62aaf40fda4d5d26cb146b;hp=be2613298b73358e229ac581638c18e4f5a4ccdb;hpb=2d6b3a90dbb88b26ca5ec1deae4a4b1e2b808c50;p=pve-common.git diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm index be26132..71af2b8 100644 --- a/src/PVE/Network.pm +++ b/src/PVE/Network.pm @@ -179,6 +179,8 @@ my $bridge_add_interface = sub { if ($tag) { system("/sbin/bridge vlan add dev $iface vid $tag pvid untagged") == 0 || die "unable to add vlan $tag to interface $iface\n"; + + warn "Caution: Setting VLAN ID 1 on a VLAN aware bridge may be dangerous\n" if $tag == 1; } else { system("/sbin/bridge vlan add dev $iface vid 2-4094") == 0 || die "unable to add default vlan tags to interface $iface\n" if !$trunks; @@ -440,7 +442,7 @@ sub activate_bridge_vlan { my @ifaces = (); my $dir = "/sys/class/net/$bridge/brif"; - PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+(\.\d+)?)', sub { + PVE::Tools::dir_glob_foreach($dir, '(((eth|bond)\d+|en[^.]+)(\.\d+)?)', sub { push @ifaces, $_[0]; });