X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Frule_generator%2Fwrite_net_rules;h=d1086f086ee998cd16d6937bfec56cd003fa87ed;hp=b25ecfd8069e7671b68c27540dbfd99643dec1b3;hb=85e73aef06d79771cee9cefb56ce830c3c2d3344;hpb=c746922ca26fe18f6b3f3a4516e7236bfc0106b7

diff --git a/extras/rule_generator/write_net_rules b/extras/rule_generator/write_net_rules
index b25ecfd80..d1086f086 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
@@ -88,9 +93,13 @@ fi
 
 if [ -z "$match" ]; then
 	echo "missing valid match" >&2
+	unlock_rules_file
 	exit 1
 fi
 
+basename=${INTERFACE%%[0-9]*}
+match="$match, KERNEL==\"$basename*\""
+
 if [ "$INTERFACE_NAME" ]; then
 	# external tools may request a custom name
 	COMMENT="$COMMENT (custom name provided by external tool)"
@@ -100,7 +109,6 @@ if [ "$INTERFACE_NAME" ]; then
 	fi
 else
 	# if a rule using the current name already exists, find a new name
-	basename=${INTERFACE%%[0-9]*}
 	if interface_name_taken; then
 		INTERFACE="$basename$(find_next_available "$basename[0-9]*")"
 		echo "INTERFACE_NEW=$INTERFACE"