diff options
| author | Andrew Shadura <andrewsh@debian.org> | 2014-04-01 09:42:56 +0200 |
|---|---|---|
| committer | Andrew Shadura <andrewsh@debian.org> | 2014-04-01 09:42:56 +0200 |
| commit | 7517228145310a29b7cb7f4bddccb1b70df347eb (patch) | |
| tree | fc9a6058ff2d8d761a88c268bf05a353ea6c3f38 /debian/network/if-post-down.d/vlan | |
| parent | f118e1000ca02c6fcb7ff9cc1ea1f485fec6b2c2 (diff) | |
Import Debian changes 1.9-3.2
vlan (1.9-3.2) unstable; urgency=medium
* Non-maintainer upload.
* Don't exit when we're called by bridge-utils.
Diffstat (limited to 'debian/network/if-post-down.d/vlan')
| -rw-r--r-- | debian/network/if-post-down.d/vlan | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/debian/network/if-post-down.d/vlan b/debian/network/if-post-down.d/vlan index bade97f..73e3dd9 100644 --- a/debian/network/if-post-down.d/vlan +++ b/debian/network/if-post-down.d/vlan @@ -11,12 +11,14 @@ case "$IFACE" in ;; eth*.0*|bond*.0*|wlan*.0*) # Silently ignore interfaces which ifupdown handles on its own - [ -z "$IF_VLAN_RAW_DEVICE" ] && exit 0 + # If IF_BRIDGE_PORTS is set, probably we're called by bridge-utils + [ -z "$IF_VLAN_RAW_DEVICE" -a -z "$IF_BRIDGE_PORTS" ] && exit 0 IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/"` ;; eth*.*|bond*.*|wlan*.*) # Silently ignore interfaces which ifupdown handles on its own - [ -z "$IF_VLAN_RAW_DEVICE" ] && exit 0 + # If IF_BRIDGE_PORTS is set, probably we're called by bridge-utils + [ -z "$IF_VLAN_RAW_DEVICE" -a -z "$IF_BRIDGE_PORTS" ] && exit 0 IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/;s/\(wlan[0-9][0-9]*\)\..*/\1/"` ;; # Test for vlan raw device (#196890, #292648) |