rule-generator: cd - skip by-path links if we create by-id links

This commit is contained in:
Kay Sievers 2009-05-14 12:57:19 +02:00
parent 1e5e05730a
commit b4fa1b67f8
2 changed files with 7 additions and 3 deletions

View File

@ -1,6 +1,9 @@
# these rules generate rules for the /dev/{cdrom,dvd,...} symlinks # these rules generate rules for the /dev/{cdrom,dvd,...} symlinks
# the path of removable devices changes frequently # the "path" of usb/ieee1394 devices changes frequently, use "id"
ACTION=="add", SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394", ENV{ID_CDROM}=="?*", ENV{GENERATED}!="?*", PROGRAM="write_cd_rules by-id", SYMLINK+="%c" ACTION=="add", SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394", ENV{ID_CDROM}=="?*", ENV{GENERATED}!="?*", \
PROGRAM="write_cd_rules by-id", SYMLINK+="%c", GOTO="persistent_cd_end"
ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{GENERATED}!="?*", PROGRAM="write_cd_rules", SYMLINK+="%c" ACTION=="add", SUBSYSTEM=="block", ENV{ID_CDROM}=="?*", ENV{GENERATED}!="?*", PROGRAM="write_cd_rules", SYMLINK+="%c"
LABEL="persistent_cd_end"

View File

@ -97,7 +97,7 @@ choose_rules_file
link_num=$(find_next_available 'cdrom[0-9]*') link_num=$(find_next_available 'cdrom[0-9]*')
match="ENV{ID_CDROM}==\"?*\", $RULE" match="SUBSYSTEM==\"block\", ENV{ID_CDROM}==\"?*\", $RULE"
comment="$ID_MODEL ($ID_PATH)" comment="$ID_MODEL ($ID_PATH)"
@ -108,6 +108,7 @@ comment="$ID_MODEL ($ID_PATH)"
write_rule "$match" "dvd$link_num" write_rule "$match" "dvd$link_num"
[ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \ [ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \
write_rule "$match" "dvdrw$link_num" write_rule "$match" "dvdrw$link_num"
echo >> $RULES_FILE
unlock_rules_file unlock_rules_file