rules_generator: add missing write_net_rules unlock

[elogind.git] / extras / rule_generator / write_cd_rules

diff --git a/extras/rule_generator/write_cd_rules b/extras/rule_generator/write_cd_rules
index 232daeb86b11ad2ae1de8beb256775e21fbe3434..d74b20128d1d5027f2883e0a27d5be3480dbbc06 100644 (file)
--- a/extras/rule_generator/write_cd_rules
+++ b/extras/rule_generator/write_cd_rules
@@ -16,7 +16,7 @@ RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
 . /lib/udev/rule_generator.functions
 
 find_next_available() {
-       raw_find_next_available "$(find_all_rules 'SYMLINK+=' $1)"
+       raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")"
 }
 
 write_rule() {
@@ -50,6 +50,38 @@ if [ -z "$ID_CDROM" ]; then
        exit 1
 fi
 
+if [ "$1" ]; then
+       METHOD="$1"
+else
+       METHOD='by-path'
+fi
+
+case "$METHOD" in
+       by-path)
+       if [ -z "$ID_PATH" ]; then
+               echo "$DEVPATH not supported by path_id. by-id may work." >&2
+               exit 1
+       fi
+       RULE="ENV{ID_PATH}==\"$ID_PATH\""
+       ;;
+
+       by-id)
+       if [ "$ID_SERIAL" ]; then
+               RULE="ENV{ID_SERIAL}==\"$ID_SERIAL\""
+       elif [ "$ID_MODEL" -a "$ID_REVISION" ]; then
+               RULE="ENV{ID_MODEL}==\"$ID_MODEL\", ENV{ID_REVISION}==\"$ID_REVISION\""
+       else
+               echo "$DEVPATH not supported by ata_id. by-path may work." >&2
+               exit 1
+       fi
+       ;;
+
+       *)
+       echo "Invalid argument (must be either by-path or by-id)." >&2
+       exit 1
+       ;;
+esac
+
 # Prevent concurrent processes from modifying the file at the same time.
 lock_rules_file
 
@@ -58,7 +90,7 @@ choose_rules_file
 
 link_num=$(find_next_available 'cdrom[0-9]*')
 
-match="ENV{ID_CDROM}==\"?*\", ENV{ID_PATH}==\"$ID_PATH\""
+match="ENV{ID_CDROM}==\"?*\", $RULE"
 
 comment="$ID_MODEL ($ID_PATH)"