summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-27 11:04:31 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-27 11:04:31 -0700
commitdbbb25895e70ce118dd7e4fd5cf6ecd9d09df543 (patch)
tree24c0e687155be6b7ec8778f31698fe730e2e5fe0
parent0a11a60575e9f573820f15390257488fa70343ea (diff)
downloadvyatta-cfg-system-dbbb25895e70ce118dd7e4fd5cf6ecd9d09df543.tar.gz
vyatta-cfg-system-dbbb25895e70ce118dd7e4fd5cf6ecd9d09df543.zip
Don't rename vif and other non-driver interfaces
Bug 6379 Just leave vlan and other pseudo-interface names alone.
-rw-r--r--sysconf/65-vyatta-net.rules8
1 files changed, 7 insertions, 1 deletions
diff --git a/sysconf/65-vyatta-net.rules b/sysconf/65-vyatta-net.rules
index 1372110f..a2ae654c 100644
--- a/sysconf/65-vyatta-net.rules
+++ b/sysconf/65-vyatta-net.rules
@@ -8,6 +8,12 @@ SUBSYSTEM!="net", GOTO="vyatta_net_end"
NAME=="?*", GOTO="vyatta_net_end"
# Do name change for ethernet and wireless devices only
-KERNEL=="eth*|wlan*", PROGRAM="vyatta_net_name %k $attr{address}", NAME="%c"
+KERNEL!="eth*|wlan*", GOTO="vyatta_net_end"
+
+# ignore "secondary" monitor interfaces of mac80211 drivers
+KERNEL=="wlan*", ATTRS{type}=="803", GOTO="persistent_net_generator_end"
+
+# ignore interfaces without a driver link like bridges and VLANs
+DRIVERS=="?*", PROGRAM="vyatta_net_name %k $attr{address}", NAME="%c"
LABEL="vyatta_net_end"