rules: first simple step merging with Ubuntu rules

[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 f98b6287503fbd98a2c6e4004b066edd919d1455..c58e24f66e8776224f3123a6ee086e5edd7bed19 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -56,9 +56,6 @@ KERNEL=="dv1394*",            SYMLINK+="dv1394/%n"
 KERNEL=="video1394*",          NAME="video1394/%n"
 KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
 
-# firmware class requests
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
-
 # libusb device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
@@ -87,7 +84,8 @@ KERNEL=="pktcdvd[0-9]*",      NAME="pktcdvd/%k"
 KERNEL=="pktcdvd",             NAME="pktcdvd/control"
 KERNEL=="qft0",                        SYMLINK+="ftape"
 SUBSYSTEM=="bsg",              NAME="bsg/%k"
-SUBSYSTEM=="aoe",              NAME="etherd/%k", GROUP="disk"
+SUBSYSTEM=="aoe",              NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
 
 # network
 KERNEL=="tun",                 NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
@@ -111,6 +109,11 @@ KERNEL=="slram[0-9]*",             SYMLINK+="xpram%n"
 KERNEL=="sxctl",               NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="rioctl",              NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="iowarrior[0-9]*",     NAME="usb/%k"
+KERNEL=="hiddev[0-9]*",                NAME="usb/%k"
+KERNEL=="legousbtower[0-9]*",  NAME="usb/%k"
+KERNEL=="dabusb[0-9]*",                NAME="usb/%k"
+KERNEL=="usbdpfp[0-9]*",       NAME="usb/%k"
+KERNEL=="cpad[0-9]*",          NAME="usb/%k"
 
 # do not delete static device nodes
 ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"