From c8ee8f983f351929066cbab75ae4f8c4256f425d Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 20 Nov 2007 18:18:03 +0100 Subject: [PATCH 1/1] 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. --- extras/rule_generator/75-persistent-net-generator.rules | 3 +++ 1 file changed, 3 insertions(+) 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" -- 2.30.2