X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fcdrom_id%2F60-cdrom_id.rules;h=353f522b0b0bbe22eb0fdf0d65ff7bf8e37a5f8d;hb=220893b3cbdbf8932f95c44811b169a8f0d33939;hp=aedf6f0558994b2b9985a5a8caa89d80bf16d666;hpb=55eb500cc5465babf1fd773dbcceeb90eeefd997;p=elogind.git

diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules
index aedf6f055..353f522b0 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 --export $tempnode"
+
+# media eject button pressed
+ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdrom_id --eject-media $devnode", 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 $devnode"
 
 LABEL="cdrom_end"