|
Line
Link Here
|
| 0 |
-- /usr/share/perl5/PVE/INotifyEtcnetOverride.pm.orig |
0 |
++ /usr/share/perl5/PVE/INotifyEtcnetOverride.pm |
|
Lines 392-405
Link Here
|
| 392 |
} elsif ($type eq 'vlan') { |
392 |
} elsif ($type eq 'vlan') { |
| 393 |
$options->{'HOST'}=$vlan_raw_device; |
393 |
my $parent_iface; |
|
|
394 |
if ($vlan_raw_device) { |
| 395 |
$parent_iface = $vlan_raw_device; |
| 396 |
} elsif ($iface =~ /^([^.]+)\./) { |
| 397 |
$parent_iface = $1; |
| 398 |
} |
| 399 |
$options->{'HOST'}=$parent_iface if $parent_iface; |
| 394 |
} |
400 |
++ /etc/net/scripts/create-bri |
| 395 |
if ($vlan_raw_device =~ /^vmbr/) { |
|
|
| 396 |
if ($iface =~ /^$vlan_raw_device\./) { |
| 397 |
$options->{'TYPE'}='brivlanport'; |
| 398 |
} else { |
| 399 |
die "Oops! etcnet writer: vlan brivlanport $iface: name expected to start from $vlan_raw_device"; |
| 400 |
} |
| 401 |
-- /etc/net/scripts/create-bri.orig |
|
Lines 18-23
Link Here
|
| 18 |
is_yes "$VLAN_AWARE" && BRIDGE_OPTIONS="${BRIDGE_OPTIONS:+"$BRIDGE_OPTIONS" }vlan_filtering 1" |
18 |
is_yes "$VLAN_AWARE" && BRIDGE_OPTIONS="${BRIDGE_OPTIONS:+"$BRIDGE_OPTIONS" }vlan_filtering 1" |
| 19 |
$IP link set $NAME type bridge $BRIDGE_OPTIONS |
19 |
$IP link set $NAME type bridge $BRIDGE_OPTIONS |
| 20 |
|
20 |
|
|
|
21 |
# Add VLANs to bridge itself if VLAN-aware |
| 22 |
is_yes "$VLAN_AWARE" && { |
| 23 |
if [ -n "$VIDS" ]; then |
| 24 |
for vid in $VIDS; do |
| 25 |
$BRIDGE vlan add dev $NAME vid $vid self && print_progress |
| 26 |
done |
| 27 |
fi |
| 28 |
} |
| 29 |
|
| 21 |
for host in $HOST; do |
30 |
for host in $HOST; do |
| 22 |
$IP link set $host master $NAME && print_progress |
31 |
$IP link set $host master $NAME && print_progress |
| 23 |
is_yes "$VLAN_AWARE" && { |
32 |
is_yes "$VLAN_AWARE" && { |
| 24 |
-- /etc/net/scripts/create-vlan.orig |
33 |
++ /etc/net/scripts/create-vlan |
|
Lines 3-8
Link Here
|
| 3 |
pickup_defaults |
3 |
pickup_defaults |
| 4 |
pickup_options |
4 |
pickup_options |
| 5 |
|
5 |
|
|
|
6 |
# If HOST is not set but NAME contains dot, try to extract parent interface |
| 7 |
if [ -z "$HOST" ] && echo "$NAME" | grep -q '\.'; then |
| 8 |
HOST=$(echo "$NAME" | cut -d. -f1) |
| 9 |
print_progress |
| 10 |
fi |
| 11 |
|
| 6 |
: ${HOST:?HOST is missing for $NAME} |
12 |
: ${HOST:?HOST is missing for $NAME} |
| 7 |
: ${VID:?VID is missing for $NAME} |
13 |
: ${VID:?VID is missing for $NAME} |
