Add support for wlan in if-pre-up and if-post-down scripts; mention it in NEWS

4 files changed, 20 insertions, 12 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 3bd8a7e..4907a10 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -9,4 +9,9 @@ vlan (1.9-3) unstable; urgency=low
     favor of compatibility with upstream error codes.  See Debian #320452 for
     the original report on broken exit codes.
 
- -- Loic Minier <lool@dooz.org>  Sun, 30 Sep 2007 16:33:40 +0200
+  * The if-pre-up.d and if-post-down.d vlan scripts now support bond and wlan
+    devices like eth devices; make sure this doesn't conflict with your local
+    setup.  The recommended way to set the underlying raw device is the
+    vlan-raw-device keyword; see vlan-interfaces(5).
+
+ -- Loic Minier <lool@dooz.org>  Sun, 30 Sep 2007 17:55:07 +0200
diff --git a/debian/changelog b/debian/changelog
index 87b3b72..9af551b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,11 @@ vlan (1.9-3) UNRELEASED; urgency=low
     these scripts; closes: #404630.
   * Point to the vlan-interfaces(5) man page in the Debian README and
     recommend setting vlan-raw-device.
+  * Add support for wlan in if-pre-up and if-post-down scripts;
+    closes: #398837.
+  * Document the bonding and wlan changes in NEWS.
 
- -- Loic Minier <lool@dooz.org>  Sun, 30 Sep 2007 17:48:04 +0200
+ -- Loic Minier <lool@dooz.org>  Sun, 30 Sep 2007 17:57:22 +0200
 
 vlan (1.9-2) unstable; urgency=medium
 
diff --git a/debian/network/if-post-down.d/vlan b/debian/network/if-post-down.d/vlan
index 5d3cba5..89b16fb 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*)
-    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/"`
+  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*.*|bond*.*)
-    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[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/"`
   ;;
   # 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 8753998..b977be8 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*)
+  eth*.0*|bond*.0*|wlan*.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*//"`
-    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[0-9][0-9]*\)\..*/\1/"`
+    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/"`
   ;;
-  eth*.*|bond*.*)
+  eth*.*|bond*.*|wlan*.*)
     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"`
-    IF_VLAN_RAW_DEVICE=`echo $IFACE|sed "s/\(eth[0-9][0-9]*\)\..*/\1/;s/\(bond[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"`
+    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/"`
   ;;
   *.0*)
     # Silently ignore interfaces which we do not (know how to) support