Import Debian changes 1.9-3ubuntu6

vlan (1.9-3ubuntu6) precise; urgency=low

  * Support biosdevname interface names out of the box (LP: #948559).

3 files changed, 16 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index c241e93..99db2bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlan (1.9-3ubuntu6) precise; urgency=low
+
+  * Support biosdevname interface names out of the box (LP: #948559).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 07 Mar 2012 12:11:55 +0000
+
 vlan (1.9-3ubuntu5) precise; urgency=low
 
   * Now that a vlan interface can be created by a udev hook and
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)
   *)
diff --git a/debian/network/if-pre-up.d/vlan b/debian/network/if-pre-up.d/vlan
index b762af8..15bb746 100644
--- a/debian/network/if-pre-up.d/vlan
+++ b/debian/network/if-pre-up.d/vlan
@@ -15,15 +15,15 @@ case "$IFACE" in
     vconfig set_name_type VLAN_PLUS_VID_NO_PAD
     VLANID=`echo $IFACE|sed "s/vlan0*//"`
   ;;
-  eth*.0*|bond*.0*|wlan*.0*)
+  eth*.0*|bond*.0*|wlan*.0*|em*.0*|p[0-9]*.0*)
     vconfig set_name_type DEV_PLUS_VID
-    VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//;s/wlan[0-9][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/"`
+    VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//g;s/wlan[0-9][0-9]*\.0*//g;s/em[0-9][0-9]*\.0*//g;s/p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\.0*//g"`
+    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*.*)
+  eth*.*|bond*.*|wlan*.*|em*.*|p[0-9]*.*)
     vconfig set_name_type DEV_PLUS_VID_NO_PAD
-    VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//g;s/wlan[0-9][0-9]*\.0*//g"`
-    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/"`
+    VLANID=`echo $IFACE|sed "s/eth[0-9][0-9]*\.0*//g;s/bond[0-9][0-9]*\.0*//g;s/wlan[0-9][0-9]*\.0*//g;s/em[0-9][0-9]*\.0*//g;s/p[0-9][0-9]*\(p[0-9][0-9]*\)\?\(_[0-9][0-9]*\)\?\.0*//g"`
+    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/"`
   ;;
   *.0*)
     # Silently ignore interfaces which we do not (know how to) support