summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-09-16 20:08:50 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-09-16 20:08:50 +0200
commit4b4409b1eed0e40a34e16d3ef2e29462e5190ca0 (patch)
tree07d32102040c70eae5b4e7372923b9c79741c6f3 /rules
parent8a483b0cb223166a8ba9d063a731934816d7500b (diff)
rules: drop almost all NAME= keys
The drivers in kernel 2.6.31 supply the names for custom node names if needed.
Diffstat (limited to 'rules')
-rw-r--r--rules/packages/40-alsa.rules10
-rw-r--r--rules/rules.d/50-udev-default.rules55
2 files changed, 23 insertions, 42 deletions
diff --git a/rules/packages/40-alsa.rules b/rules/packages/40-alsa.rules
deleted file mode 100644
index abdde8cf91..0000000000
--- a/rules/packages/40-alsa.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-SUBSYSTEM=="sound", GROUP="audio"
-KERNEL=="controlC[0-9]*", NAME="snd/%k"
-KERNEL=="hwC[D0-9]*", NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k"
-KERNEL=="midiC[D0-9]*", NAME="snd/%k"
-KERNEL=="timer", NAME="snd/%k"
-KERNEL=="seq", NAME="snd/%k"
-KERNEL=="mixer0", SYMLINK+="mixer"
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 200e2b4e51..79c8e231f4 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -14,7 +14,7 @@ KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty"
# serial
KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
KERNEL=="ppp", MODE="0600"
-KERNEL=="mwave", NAME="modems/mwave", GROUP="dialout"
+KERNEL=="mwave", GROUP="dialout"
KERNEL=="hvc*|hvsi*", GROUP="dialout"
# mem
@@ -22,9 +22,9 @@ KERNEL=="null|zero|full|random|urandom", MODE="0666"
KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
# input
-KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640"
-KERNEL=="ts[0-9]*|uinput", NAME="input/%k", MODE="0640"
-KERNEL=="js[0-9]*", NAME="input/%k", MODE="0644"
+KERNEL=="mouse*|mice|event*", MODE="0640"
+KERNEL=="ts[0-9]*|uinput", MODE="0640"
+KERNEL=="js[0-9]*", MODE="0644"
# video4linux
SUBSYSTEM=="video4linux", GROUP="video"
@@ -34,30 +34,34 @@ KERNEL=="winradio*", GROUP="video"
# graphics
KERNEL=="agpgart", MODE="0600", GROUP="video"
-KERNEL=="card[0-9]*", NAME="dri/%k"
KERNEL=="pmu", GROUP="video"
KERNEL=="nvidia*|nvidiactl*", GROUP="video"
SUBSYSTEM=="graphics", GROUP="video"
SUBSYSTEM=="drm", GROUP="video"
+# sound
+SUBSYSTEM=="sound", GROUP="audio"
+KERNEL=="mixer0", SYMLINK+="mixer"
+
# 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", GROUP="video"
-# FireWire (dv1394 and video1394 drivers)
-KERNEL=="dv1394-[0-9]*", NAME="dv1394/%n", GROUP="video"
-KERNEL=="video1394-[0-9]*", NAME="video1394/%n", GROUP="video"
# FireWire (firewire-core driver: IIDC devices, AV/C devices)
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
+# FireWire (deprecated dv1394 and video1394 drivers)
+KERNEL=="dv1394-[0-9]*", NAME="dv1394/%n", GROUP="video"
+KERNEL=="video1394-[0-9]*", NAME="video1394/%n", GROUP="video"
+
# libusb device nodes
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
# printer
KERNEL=="parport[0-9]*", GROUP="lp"
SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp"
SUBSYSTEM=="ppdev", GROUP="lp"
-SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
+SUBSYSTEM=="usb", KERNEL=="lp*", SYMLINK+="usb%k", GROUP="lp"
KERNEL=="lp[0-9]*", GROUP="lp"
KERNEL=="irlpt[0-9]*", GROUP="lp"
# hplip and cups 1.4+ use raw USB devices, so permissions should be similar to
@@ -77,8 +81,8 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitio
SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
-KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
-KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
+KERNEL=="pktcdvd", GROUP="cdrom"
# tape
KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
@@ -90,38 +94,25 @@ KERNEL=="sch[0-9]*", GROUP="disk"
SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
KERNEL=="pg[0-9]*", GROUP="disk"
KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
-KERNEL=="rawctl", NAME="raw/rawctl", GROUP="disk"
-SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
-SUBSYSTEM=="bsg", NAME="bsg/%k"
-SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk", MODE="0220"
+KERNEL=="rawctl", GROUP="disk"
+SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk"
+SUBSYSTEM=="aoe", GROUP="disk", MODE="0220"
SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
# network
-KERNEL=="tun", NAME="net/%k", MODE="0666"
+KERNEL=="tun", MODE="0666"
KERNEL=="rfkill", MODE="0644"
# CPU
-KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid", MODE="0444"
-KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
-KERNEL=="microcode", NAME="cpu/microcode", MODE="0600"
+KERNEL=="cpu[0-9]*", MODE="0444"
# miscellaneous
KERNEL=="fuse", MODE="0666"
SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc"
-KERNEL=="auer[0-9]*", NAME="usb/%k"
-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=="rioctl", NAME="specialix_rioctl"
-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"
ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
+ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"