rules: Gentoo update

diff --git a/etc/udev/gentoo/30-kernel-compat.rules b/etc/udev/gentoo/30-kernel-compat.rules
index 7bc55c6f75babf69d5ee25a7f21793e7aeab616b..1f767df8d8613e7380b30732f18fe15e092bd856 100644 (file)
--- a/etc/udev/gentoo/30-kernel-compat.rules
+++ b/etc/udev/gentoo/30-kernel-compat.rules
@@ -34,13 +34,13 @@ SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
        # sr:           4 TYPE_WORM, 5 TYPE_ROM
        # st/osst:      1 TYPE_TAPE
 
-       ATTRS{type}=="0|7|14",  RUN+="modprobe.sh sd_mod"
-       ATTRS{type}=="4|5",     RUN+="modprobe.sh sr_mod"
-       ATTRS{type}=="8",       RUN+="modprobe.sh ch"
+       ATTRS{type}=="0|7|14",  RUN+="/sbin/modprobe sd_mod"
+       ATTRS{type}=="4|5",     RUN+="/sbin/modprobe sr_mod"
+       ATTRS{type}=="8",       RUN+="/sbin/modprobe ch"
 
        ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-               ATTRS{model}!="ADR*", RUN+="modprobe.sh osst", GOTO="kernel_compat_end"
-       ATTRS{type}=="1", RUN+="modprobe.sh st"
+               ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst", GOTO="kernel_compat_end"
+       ATTRS{type}=="1", RUN+="/sbin/modprobe st"
 
 LABEL="kernel_compat_end"
 

diff --git a/etc/udev/gentoo/40-audio.rules b/etc/udev/gentoo/40-audio.rules
new file mode 100644 (file)
index 0000000..8dfcb28
--- /dev/null
+++ b/etc/udev/gentoo/40-audio.rules
@@ -0,0 +1,23 @@
+# do not edit this file, it will be overwritten on update
+
+# alsa devices
+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"
+
+# Do we need these? upstream has this in 40-alsa.rules, but we never had these
+#KERNEL=="mixer0",             SYMLINK+="mixer"
+#KERNEL=="dsp0",                       SYMLINK+="dsp"
+#KERNEL=="audio0",             SYMLINK+="audio"
+
+# sound devices
+KERNEL=="adsp|adsp[0-9]*",             NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="audio|audio[0-9]*",           NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="dsp|dsp[0-9]*",               NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="mixer|mixer[0-9]*",           NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+KERNEL=="sequencer|sequencer[0-9]*",   NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+

diff --git a/etc/udev/gentoo/40-video.rules b/etc/udev/gentoo/40-video.rules
new file mode 100644 (file)
index 0000000..aafcb2d
--- /dev/null
+++ b/etc/udev/gentoo/40-video.rules
@@ -0,0 +1,24 @@
+# do not edit this file, it will be overwritten on update
+
+# video4linux
+KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", GROUP="video"
+
+SUBSYSTEM=="dvb", GROUP="video"
+
+# device node will be /dev/dri/card?
+KERNEL=="card*",       GROUP="video"
+KERNEL=="nvidia*",     GROUP="video"
+KERNEL=="3dfx*",       GROUP="video"
+
+# Framebuffer
+# do we need /dev/fb/0 really?
+# it conflicts with symlink /dev/fb -> /dev/fb0 upstream rules create
+#KERNEL=="fb[0-9]*",   NAME="fb/%n", SYMLINK+="%k", GROUP="video"
+KERNEL=="fb[0-9]*", GROUP="video"
+
+# IEEE1394 (firewire) devices
+KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
+

diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
deleted file mode 100644 (file)
index 7c2ac81..0000000
--- a/etc/udev/gentoo/50-udev.rules
+++ /dev/null
@@ -1,255 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# /etc/udev/rules/50-udev.rules:  device naming rules for udev
-#
-# Gentoo specific rules
-#
-
-# Net devices can have arbitrary names, even
-# ones set by the user. Not try to match normal
-# rules on net devices (Bug #166652)
-SUBSYSTEM=="net", GOTO="gentoo_device_rules_end"
-
-# console
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",    OPTIONS="last_rule"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",    OPTIONS="last_rule"
-KERNEL=="vcs*",                 NAME="%k", GROUP="tty",                        OPTIONS="last_rule"
-KERNEL=="vcsa*",                NAME="%k", GROUP="tty",                        OPTIONS="last_rule"
-KERNEL=="tty",                  NAME="%k", GROUP="tty", MODE="0666",   OPTIONS="last_rule"
-KERNEL=="tty[0-9]",             NAME="%k", GROUP="tty",                        OPTIONS="last_rule"
-KERNEL=="tty[0-9][0-9]",        NAME="%k", GROUP="tty",                        OPTIONS="last_rule"
-KERNEL=="console",             NAME="%k", GROUP="tty", MODE="0600"
-KERNEL=="ptmx",                        NAME="%k", GROUP="tty", MODE="0666"
-
-# tty devices
-KERNEL=="ttyS[0-9]*",  NAME="%k", SYMLINK="tts/%n", GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB[0-9]*",        NAME="%k", SYMLINK="tts/USB%n", GROUP="uucp", MODE="0660"
-KERNEL=="ippp0",       NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="isdn*"                NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="dcbri*",      NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="ircomm*",     NAME="%k", GROUP="uucp", MODE="0660"
-
-# all block devices
-SUBSYSTEM=="block", GROUP="disk"
-
-# cdrom symlinks and other good cdrom naming
-KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", ACTION=="add", IMPORT{program}="cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*", GROUP="cdrom"
-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
-
-# assign cdrom-permission also to associated generic device (for cd-burning ...)
-KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", GROUP="cdrom"
-
-# disk devices
-KERNEL=="sd*",         NAME="%k", GROUP="disk"
-KERNEL=="dasd*",       NAME="%k", GROUP="disk"
-KERNEL=="ataraid*",    NAME="%k", GROUP="disk"
-
-# compaq smart array
-KERNEL=="cciss*",      NAME="%k"
-KERNEL=="ida*",                NAME="%k"
-
-# mylex
-KERNEL=="rd*",         NAME="%k"
-
-# dri devices
-KERNEL=="card*",       NAME="dri/card%n", GROUP="video"
-KERNEL=="nvidia*",     NAME="%k", GROUP="video"
-KERNEL=="3dfx*",       NAME="%k", GROUP="video"
-
-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio"
-KERNEL=="controlC[0-9]*",      NAME="snd/%k"
-KERNEL=="hw[CD0-9]*",          NAME="snd/%k"
-KERNEL=="pcm[CD0-9cp]*",       NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",                NAME="snd/%k"
-KERNEL=="timer",               NAME="snd/%k"
-KERNEL=="seq",                 NAME="snd/%k"
-
-# capi devices
-KERNEL=="capi",                NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp", MODE="0660"
-KERNEL=="capi*",       NAME="capi/%n", GROUP="uucp", MODE="0660"
-
-# cpu devices
-KERNEL=="cpu[0-9]*",   NAME="cpu/%n/cpuid"
-KERNEL=="msr[0-9]*",   NAME="cpu/%n/msr"
-KERNEL=="microcode",   NAME="cpu/microcode"
-
-# fb devices
-KERNEL=="fb[0-9]*",    NAME="fb/%n", SYMLINK+="%k", GROUP="video"
-
-# floppy devices
-KERNEL=="fd[0-9]*",    NAME="floppy/%k", SYMLINK+="%k", GROUP="floppy"
-KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/floppy/%k"
-KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f $root/floppy/%k?*'"
-
-# i2c devices
-KERNEL=="i2c-[0-9]*",  NAME="i2c/%n", SYMLINK+="%k"
-
-# input devices
-KERNEL=="mice",                NAME="input/%k", MODE="0644"
-KERNEL=="mouse*",      NAME="input/%k", MODE="0644"
-KERNEL=="event*",      NAME="input/%k", MODE="0600"
-KERNEL=="js*",         NAME="input/%k", MODE="0664"
-KERNEL=="ts*",         NAME="input/%k", MODE="0600"
-
-# loop devices
-KERNEL=="loop[0-9]*",  NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
-
-# md block devices
-KERNEL=="md[0-9]*",    NAME="md/%n", SYMLINK+="%k", GROUP="disk"
-
-# aoe char devices,
-SUBSYSTEM=="aoe", KERNEL=="discover",  NAME="etherd/%k", GROUP="disk", MODE="0220"
-SUBSYSTEM=="aoe", KERNEL=="err",       NAME="etherd/%k", GROUP="disk", MODE="0440"
-SUBSYSTEM=="aoe", KERNEL=="interfaces",        NAME="etherd/%k", GROUP="disk", MODE="0220"
-
-# misc devices
-KERNEL=="agpgart",     NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="psaux",       NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="rtc",         NAME="misc/%k", SYMLINK+="%k", MODE="0664"
-KERNEL=="uinput",      NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="inotify",     NAME="misc/%k", SYMLINK+="%k", MODE="0666"
-
-# netlink devices
-KERNEL=="route",       NAME="netlink/%k"
-KERNEL=="skip",                NAME="netlink/%k"
-KERNEL=="usersock",    NAME="netlink/%k"
-KERNEL=="fwmonitor",   NAME="netlink/%k"
-KERNEL=="tcpdiag",     NAME="netlink/%k"
-KERNEL=="nflog",       NAME="netlink/%k"
-KERNEL=="xfrm",                NAME="netlink/%k"
-KERNEL=="arpd",                NAME="netlink/%k"
-KERNEL=="route6",      NAME="netlink/%k"
-KERNEL=="ip6_fw",      NAME="netlink/%k"
-KERNEL=="dnrtmsg",     NAME="netlink/%k"
-KERNEL=="tap*",                NAME="netlink/%k"
-
-# network devices
-KERNEL=="tun",         NAME="net/%k",  MODE="0660", OPTIONS+="ignore_remove"
-KERNEL=="ppp",         MODE="0600", OPTIONS+="ignore_remove"
-
-# ramdisk devices
-KERNEL=="ram[0-9]*",   NAME="rd/%n", SYMLINK+="%k"
-
-# IEEE1394 (firewire) devices (must be before raw devices below)
-KERNEL=="raw1394",     NAME="%k",              GROUP="video"
-KERNEL=="dv1394*",     NAME="dv1394/%n",       GROUP="video"
-KERNEL=="video1394*",  NAME="video1394/%n",    GROUP="video"
-
-# raw devices
-SUBSYSTEM=="raw",      KERNEL=="raw[0-9]*",    NAME="raw/%k", GROUP="disk"
-KERNEL=="ram*",                NAME="%k", GROUP="disk"
-
-# sound devices
-KERNEL=="adsp",                        NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="adsp[0-9]*",          NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="audio",               NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="audio[0-9]*",         NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="dsp",                 NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="dsp[0-9]*",           NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="mixer",               NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="mixer[0-9]*",         NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="sequencer",           NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="sequencer[0-9]*",     NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-
-# memory devices
-KERNEL=="random",      NAME="%k", MODE="0666"
-KERNEL=="urandom",     NAME="%k", MODE="0444"
-KERNEL=="mem",         NAME="%k", MODE="0640"
-KERNEL=="kmem",                NAME="%k", MODE="0640"
-KERNEL=="port",                NAME="%k", MODE="0640"
-KERNEL=="full",                NAME="%k", MODE="0666"
-KERNEL=="null",                NAME="%k", MODE="0666"
-KERNEL=="zero",                NAME="%k", MODE="0666"
-
-# usb devices
-KERNEL=="hiddev*",             NAME="usb/%k"
-KERNEL=="auer*",               NAME="usb/%k"
-KERNEL=="legousbtower*",       NAME="usb/%k", GROUP="usb"
-KERNEL=="dabusb*",             NAME="usb/%k"
-KERNEL=="lp[0-9]*",    SUBSYSTEM=="usb",       NAME="usb/%k", GROUP="lp"
-
-# v4l devices
-KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video"
-KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video"
-KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video"
-KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", GROUP="video"
-
-# dvb devices
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
-
-# Asterisk Zaptel devices
-KERNEL=="zapctl",      NAME="zap/ctl"
-KERNEL=="zaptimer",    NAME="zap/timer"
-KERNEL=="zapchannel",  NAME="zap/channel"
-KERNEL=="zappseudo",   NAME="zap/pseudo"
-KERNEL=="zap[0-9]*",   NAME="zap/%n"
-
-# pilot/palm devices
-KERNEL=="pilot",       NAME="%k", GROUP="uucp"
-
-# jaz devices
-KERNEL=="jaz*",                NAME="%k", GROUP="disk"
-
-# zip devices
-KERNEL=="pocketzip*",  NAME="%k", GROUP="disk"
-KERNEL=="zip*",                NAME="%k", GROUP="disk"
-
-# ls120 devices
-KERNEL=="ls120",       NAME="%k", GROUP="disk"
-
-# lp devices
-KERNEL=="lp*",         NAME="%k", GROUP="lp"
-KERNEL=="irlpt",       NAME="%k", GROUP="lp"
-KERNEL=="usblp",       NAME="%k", GROUP="lp"
-KERNEL=="lp*",         NAME="%k", GROUP="lp"
-KERNEL=="parport*",    NAME="%k", GROUP="lp"
-
-# tape devices
-KERNEL=="ht*",         NAME="%k", GROUP="tape"
-KERNEL=="nht*",                NAME="%k", GROUP="tape"
-KERNEL=="pt*",         NAME="%k", GROUP="tape"
-KERNEL=="npt*",                NAME="%k", GROUP="tape"
-KERNEL=="st*",         NAME="%k", GROUP="tape"
-KERNEL=="nst*",                NAME="%k", GROUP="tape"
-KERNEL=="osst*",       NAME="%k", GROUP="tape"
-KERNEL=="nosst*",      NAME="%k", GROUP="tape"
-
-# diskonkey devices
-KERNEL=="diskonkey*",  NAME="%k", GROUP="disk"
-
-# rem_ide devices
-KERNEL=="microdrive*", NAME="%k", GROUP="disk"
-
-# kbd devices
-KERNEL=="kbd",         NAME="%k", MODE="0664"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi",      NAME="%k", MODE="0666"
-
-# packet devices
-KERNEL=="pktcdvd",             NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
-KERNEL=="pktcdvd[0-9]*",       NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
-
-# infiniband devices
-KERNEL=="umad*",       NAME="infiniband/%k"
-KERNEL=="issm*",       NAME="infiniband/%k"
-
-
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
-       NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0664" 
-
-# Timeouts for scsi devices
-# Setting timeout for tape-devices (type 1) to 900 seconds
-# and 60 seconds for device types 0, 7 and 14
-# if you need timeouts for other devices add a similar rule
-# with correct type-value, or open a bug on bugs.gentoo.org.
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
-
-
-# Load firmware
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
-
-LABEL="gentoo_device_rules_end"

diff --git a/etc/udev/gentoo/65-permissions.rules b/etc/udev/gentoo/65-permissions.rules
new file mode 100644 (file)
index 0000000..1cc31af
--- /dev/null
+++ b/etc/udev/gentoo/65-permissions.rules
@@ -0,0 +1,20 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb", MODE="664"
+
+# cdrom devices
+ENV{ID_CDROM}=="?*", GROUP="cdrom", MODE="660"
+KERNEL=="pktcdvd|pktcdvd[0-9]*", GROUP="cdrom", MODE="660"
+# assign cdrom-permission also to associated generic device (for cd-burning ...)
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[45]", GROUP="cdrom", MODE="660"
+
+
+# tape devices
+KERNEL=="st[0-9]*|nst[0-9]*|ht[0-9]*|nht[0-9]*|pt[0-9]*|npt[0-9]*", \
+       GROUP="tape", MODE="660"
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660"
+
+# dialout devices
+KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
+KERNEL=="pilot",       GROUP="uucp"
+