summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2007-11-20 18:18:03 +0100
committerKay Sievers <kay.sievers@vrfy.org>2007-11-20 18:18:03 +0100
commitc8ee8f983f351929066cbab75ae4f8c4256f425d (patch)
tree788fda7dbbb8fbee6d678d8b97b5248a0564158f
parentc645b98b7ee51c5700a54e7674083756de67affe (diff)
rules_generator: do not create rules with insufficient matches
Thanks to Alexander E. Patrakov for pointing out that we create invalid rules. We still need a proper fix for devices we skip creating rules (locally administered MAC), but want to swap names with interface names we created rules for.
-rw-r--r--extras/rule_generator/75-persistent-net-generator.rules3
1 files changed, 3 insertions, 0 deletions
diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index 726bf27871..2aa3076a59 100644
--- a/extras/rule_generator/75-persistent-net-generator.rules
+++ b/extras/rule_generator/75-persistent-net-generator.rules
@@ -44,6 +44,9 @@ SUBSYSTEMS=="ieee1394", ENV{COMMENT}="Firewire device $attr{host_id})"
# S/390 uses id matches only, do not use MAC address match
SUBSYSTEMS=="ccwgroup", ENV{COMMENT}="S/390 $driver device at $id", ENV{MATCHID}="$id", ENV{MATCHDRV}="$driver", ENV{MATCHADDR}=""
+# see if we got enough data to create a rule
+ENV{MATCHADDR}=="", ENV{MATCHID}=="", ENV{INTERFACE_NAME}=="", GOTO="persistent_net_generator_end"
+
# default comment
ENV{COMMENT}=="", ENV{COMMENT}="$env{SUBSYSTEM} device"