From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 20 Nov 2007 17:18:03 +0000 (+0100)
Subject: rules_generator: do not create rules with insufficient matches
X-Git-Tag: 174~1782
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c8ee8f983f351929066cbab75ae4f8c4256f425d

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.
---

diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules
index 726bf2787..2aa3076a5 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"