cdrom_id: open non-mounted optical media with O_EXCL

[elogind.git] / extras / modem-modeswitch / 61-mobile-action.rules

diff --git a/extras/modem-modeswitch/61-mobile-action.rules b/extras/modem-modeswitch/61-mobile-action.rules
index 9f472318b8e219fb63b48f431b57ac031d4205d2..29d460d53d24a8fd7a5c4bc5f441787f0dfcbf1a 100644 (file)
--- a/extras/modem-modeswitch/61-mobile-action.rules
+++ b/extras/modem-modeswitch/61-mobile-action.rules
@@ -1,14 +1,15 @@
 ACTION!="add", GOTO="mobile_action_end"
 
-SUBSYSTEM=="usb", ATTR{bDeviceClass}=="ff", ATTR{bDeviceSubClass}=="ff", ENV{DEVTYPE}=="usb_device", GOTO="mobile_action_switch"
+SUBSYSTEM=="usb", ATTR{bDeviceClass}=="00|ff", ATTR{bDeviceSubClass}=="00|ff", ENV{DEVTYPE}=="usb_device", GOTO="mobile_action_switch"
 GOTO="mobile_action_end"
 
 LABEL="mobile_action_switch"
 ATTRS{idVendor}=="0df7", ATTRS{idProduct}=="0800", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t mobile-action-8280p"
 
+LABEL="mobile_action_end"
+
 # modem-modeswitch does not work with these devices, the fake CD-ROM needs to be ejected
 
 # ZTE MF6xx
-ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="2000", RUN+="/usr/bin/eject %k"
+ACTION=="add", ENV{ID_CDROM}=="1", ENV{ID_VENDOR_ID}=="19d2", ENV{ID_MODEL_ID}=="2000", RUN+="/usr/bin/eject %k"
 
-LABEL="mobile_action_end"