diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2012-03-07 12:11:55 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@ubuntu.com> | 2012-03-07 12:11:55 +0000 |
| commit | 3475ed5e4f6bea42f97386e0d039a0a2afbc419f (patch) | |
| tree | 24e9eca516242e4ffaf7453c395b83ddea784040 /debian/network/if-post-down.d | |
| parent | 8a90b082c9be09b51ae36acd6ecb512972bf054b (diff) | |
Import Debian changes 1.9-3ubuntu6
vlan (1.9-3ubuntu6) precise; urgency=low
* Support biosdevname interface names out of the box (LP: #948559).
Diffstat (limited to 'debian/network/if-post-down.d')
| -rw-r--r-- | debian/network/if-post-down.d/vlan | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/network/if-post-down.d/vlan b/debian/network/if-post-down.d/vlan index 89b16fb..4d5afe7 100644 --- a/debian/network/if-post-down.d/vlan +++ b/debian/network/if-post-down.d/vlan @@ -9,11 +9,11 @@ case "$IFACE" in *:*) exit 0 ;; - eth*.0*|bond*.0*|wlan*.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*.0*|bond*.0*|wlan*.0*|em*.0*|p[0-9]*.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/;s/\(em[0-9][0-9]*\)\..*/\1/;s/\(p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\)\..*/\1/"` ;; - eth*.*|bond*.*|wlan*.*) - 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*.*|em*.*|p[0-9]*.*) + 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/;s/\(em[0-9][0-9]*\)\..*/\1/;s/\(p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\)\..*/\1/"` ;; # Test for vlan raw device (#196890, #292648) *) |