cdrom_id: add and use ID_CDROM_MEDIA to decide if we run vol_id

[elogind.git] / rules / rules.d / 50-udev-default.rules

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 38b954df1e23f1b18b637edb3aff71dd2cae78d8..abc5113cfc1dcd396ebe6a68ee15c50859f0a110 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -43,7 +43,6 @@ SUBSYSTEM=="drm",             GROUP="video"
 
 # DVB (video)
 SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"
-SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # Firewire
 KERNEL=="dv1394[0-9]*",                NAME="dv1394/%n", GROUP="video"
@@ -107,7 +106,7 @@ KERNEL=="hw_random",                NAME="hwrng"
 KERNEL=="mmtimer",             MODE="0644"
 KERNEL=="rflash[0-9]*",                MODE="0400"
 KERNEL=="rrom[0-9]*",          MODE="0400"
-KERNEL=="sxctl",               NAME="specialix_sxctl""
+KERNEL=="sxctl",               NAME="specialix_sxctl"
 KERNEL=="rioctl",              NAME="specialix_rioctl"
 KERNEL=="iowarrior[0-9]*",     NAME="usb/%k"
 KERNEL=="hiddev[0-9]*",                NAME="usb/%k"