rules_generator: net rules - add "dev_id" value to generated rules

diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index 85a4c5b55b14a55acd017de78e3028ce7113b347..2c42de0d780fd0f31d318d2ee019012df14b7a10 100644 (file)
--- 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 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}=""
 
 # 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 322398bce4b3b277a8910df2e1f32e10a7a6c134..d1086f086ee998cd16d6937bfec56cd003fa87ed 100644 (file)
--- 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
 # 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
 #   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
 
        match="$match, DRIVERS==\"$MATCHDRV\""
 fi
 

+if [ "$MATCHDEVID" ]; then
+       match="$match, ATTR{dev_id}==\"$MATCHDEVID\""
+fi
+

 if [ "$MATCHID" ]; then
        match="$match, KERNELS==\"$MATCHID\""
 fi
 if [ "$MATCHID" ]; then
        match="$match, KERNELS==\"$MATCHID\""
 fi