summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-04-27 20:19:44 +0200
committerKay Sievers <kay.sievers@vrfy.org>2008-04-27 20:19:44 +0200
commit8b6e9f287d4ba774a12c023c2ef8fc78def29df8 (patch)
tree16eb2c3276ab145f043610f89baaec9b4f7d777c
parentd8a9d017046661e3433779611f0e23266b68ba3d (diff)
rules_generator: net rules - add "dev_id" value to generated rules
-rw-r--r--extras/rule_generator/75-persistent-net-generator.rules3
-rw-r--r--extras/rule_generator/write_net_rules5
2 files changed, 8 insertions, 0 deletions
diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index 85a4c5b55b..2c42de0d78 100644
--- a/extras/rule_generator/75-persistent-net-generator.rules
+++ b/extras/rule_generator/75-persistent-net-generator.rules
@@ -29,6 +29,9 @@ ENV{MATCHADDR}="$attr{address}"
# match interface type
ENV{MATCHIFTYPE}="$attr{type}"
+# match interface dev_id
+ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}"
+
# do not use "locally administered" MAC address
ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}=""
diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index 322398bce4..d1086f086e 100644
--- a/extras/rule_generator/write_net_rules
+++ b/extras/rule_generator/write_net_rules
@@ -15,6 +15,7 @@
# variables used to communicate:
# MATCHADDR MAC address used for the match
# MATCHID bus_id used for the match
+# MATCHDEVID dev_id used for the match
# MATCHDRV driver name used for the match
# MATCHIFTYPE interface type match
# COMMENT comment to add to the generated rule
@@ -78,6 +79,10 @@ if [ "$MATCHDRV" ]; then
match="$match, DRIVERS==\"$MATCHDRV\""
fi
+if [ "$MATCHDEVID" ]; then
+ match="$match, ATTR{dev_id}==\"$MATCHDEVID\""
+fi
+
if [ "$MATCHID" ]; then
match="$match, KERNELS==\"$MATCHID\""
fi