X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fcdrom_id%2F60-cdrom_id.rules;h=896af3482562a50be6bcf1091599d00b366e330f;hb=6ac6c3a04ca47df501ba29e4f20337719ad0a776;hp=1ad1d0cc230cf39e43e132fcd30b71f3881a2dfa;hpb=cbfad6af1fdc73c6f3c6b001047ff4a86c8a6efd;p=elogind.git

diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules
index 1ad1d0cc2..896af3482 100644
--- a/extras/cdrom_id/60-cdrom_id.rules
+++ b/extras/cdrom_id/60-cdrom_id.rules
@@ -5,10 +5,14 @@ SUBSYSTEM!="block", GOTO="cdrom_end"
 KERNEL!="sr[0-9]*|xvd*", GOTO="cdrom_end"
 ENV{DEVTYPE}!="disk", GOTO="cdrom_end"
 
-# this is only a button press event
-ENV{DISK_EJECT_REQUEST}=="?*", GOTO="cdrom_end"
-
+# unconditionally tag device as CDROM
 KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1"
-IMPORT{program}="cdrom_id $tempnode"
+
+# media eject button pressed
+ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $tempnode", GOTO="cdrom_end"
+
+# import device and media properties and lock tray to
+# enable the receiving of media eject button events
+IMPORT{program}="cdrom_id --lock-media $tempnode"
 
 LABEL="cdrom_end"