X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Frule_generator%2Frule_generator.functions;h=b972091615d424c56149dc6944055b64c44665b4;hp=712ed269e0eaf8ceb9473f7007781878d887a20e;hb=0bf41e6c24ac3d8cea08dd965e29b0d66ef51f1a;hpb=1f889fb84fa14d1e7e3c2a1a3bc5e0df5c6fba23

diff --git a/extras/rule_generator/rule_generator.functions b/extras/rule_generator/rule_generator.functions
index 712ed269e..b97209161 100644
--- a/extras/rule_generator/rule_generator.functions
+++ b/extras/rule_generator/rule_generator.functions
@@ -92,6 +92,9 @@ find_all_rules() {
 	local linkre="$2"
 	local match="$3"
 
-	local search='.*[[:space:],]'"$key"'"\('"$linkre"'\)"[[:space:]]*\(,.*\|\\\|\)$'
-	echo $(sed -n -e "${match}s/${search}/\1/p" $RO_RULES_FILE $RULES_FILE)
+	local search='.*[[:space:],]'"$key"'"('"$linkre"')".*'
+	echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
+		$RO_RULES_FILE \
+		$([ -e $RULES_FILE ] && echo $RULES_FILE) \
+		2>/dev/null)
 }