summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-04-12 01:12:23 +0200
committerKay Sievers <kay.sievers@vrfy.org>2010-04-12 01:12:23 +0200
commit5c5ebde711c4560ae0560e87c33fe477b5add354 (patch)
tree7036886e796b9965b6b1179a47b636afa47002f2
parentd45c8c8b01c99180f15e24b22f7cf81eaf3cdd1b (diff)
cdrom_id: always set ID_CDROM regardless if we can run cdrom_id
-rw-r--r--extras/cdrom_id/60-cdrom_id.rules12
1 files changed, 9 insertions, 3 deletions
diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules
index 132a68049d..811c4aa530 100644
--- a/extras/cdrom_id/60-cdrom_id.rules
+++ b/extras/cdrom_id/60-cdrom_id.rules
@@ -1,5 +1,11 @@
# do not edit this file, it will be overwritten on update
-# import optical drive properties
-ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \
- KERNEL=="sr[0-9]*|xvd*", IMPORT{program}="cdrom_id --export $tempnode"
+ACTION!="add|change", GOTO="cdrom_end"
+SUBSYSTEM!="block", GOTO="cdrom_end"
+KERNEL!="sr[0-9]*|xvd*", GOTO="cdrom_end"
+ENV{DEVTYPE}!="disk", GOTO="cdrom_end"
+
+ENV{ID_CDROM}="1"
+IMPORT{program}="cdrom_id --export $tempnode"
+
+LABEL="cdrom_end"