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

diff --git a/extras/rule_generator/rule_generator.functions b/extras/rule_generator/rule_generator.functions
index 712ed269e..aaf66a6fa 100644
--- a/extras/rule_generator/rule_generator.functions
+++ b/extras/rule_generator/rule_generator.functions
@@ -92,6 +92,10 @@ 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"')"[[:space:]]*(,.*|\\|)$'
+
+	echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \
+		$RO_RULES_FILE \
+		$([ -e $RULES_FILE ] && echo $RULES_FILE) \
+		2>/dev/null)
 }