more distro rules updates

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

6 files changed, 257 insertions, 146 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 09d29c8b0a..91cef0ccd4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,9 @@
+udev 066
+========
+Minor bugfixes and some distro rules updates. If you don't have the
+persistent disk rules in /dev/disk/by-*/* on your distro, just
+grab it from here. :)
+
 udev 065
 ========
 We can use socket communication now to pass events from udev to
diff --git a/etc/udev/slackware/udev.permissions b/etc/udev/slackware/udev.permissions
deleted file mode 100644
index 2edc1aaa53..0000000000
--- a/etc/udev/slackware/udev.permissions
+++ /dev/null
@@ -1,133 +0,0 @@
-#name:user:group:mode
-pl2303:500:500:0666
-visor:root:uucp:0666
-camera*:500:500:0666
-
-# console devices
-console:root:tty:0600
-tty[0-9][0-9]*:root:tty:0666
-vcs*:root:tty:0620
-tty[CIS]*:root:uucp:0660
-ttyUB[0-9]:root:uucp:0660
-ttyUSB0:root:uucp:0660
-ttyUSB1:root:uucp:0666
-
-# pty devices
-ptmx:root:tty:0666
-pty[p-za-e][0-9a-f]*:root:tty:0666
-tty[p-za-e][0-9a-f]*:root:tty:0666
-cu[abiu]*:root:uucp:0660
-
-# sound devices
-audio*:root:sys:0662
-beep:root:root:0644
-dsp*:root:sys:0662
-midi*:root:sys:0662
-mixer*:root:sys:0666
-music:root:sys:0662
-sequencer*:root:sys:0662
-snd/*:root:root:0666
-sndstat:root:sys:0662
-speaker:root:root:0644
-sound/*:root:root:0666
-admmidi*:root:root:0666
-adsp*:root:root:0666
-aload*:root:root:0666
-amidi*:root:root:0666
-amixer*:root:root:0666
-
-# input devices (mouse, joystick, etc)
-input/*:root:root:0644
-input/js*:root:games:0666
-djs[0-3]:root:games:0660
-psaux:root:sys:0660
-crash:roor:root:0660
-logibm:root:sys:0660
-jbm:root:sys:0660
-hwtrap:root:root:0644
-inportbm:root:sys:0660
-sexec:root:root:0660
-jsflash:roo:root:0660
-
-# power manager device
-apm_bios:root:root:0644
-
-# printer device
-lp[0-9]:root:lp:0660
-parport*:root:root:0660
-
-# video devices
-dri/card[0-9]*:root:root:0666
-fb[0-9]:root:tty:0660
-agpgart:root:root:0660
-nvidia*:root:root:0666
-video*:root:sys:0660
-
-# DISK devices
-ed[ab]*:root:disk:0640
-gscd0:root:disk:0640
-initrd:root:disk:0640
-lmscd:root:disk:0640
-mcd*:root:disk:0640
-md*:root:disk:0660
-mtd*:root:disk:0640
-userdma:root:root:0660
-
-# floppy devices
-fd[0-3]*:root:floppy:0660
-
-# IDE devices (hd, cdrom)
-hd*:root:disk:0660
-ht0:root:disk:0640
-
-# RAID IDE
-ataraid[0-9]*:root:disk:0660
-ataraid/*:root:disk:0660
-
-# SCSI devices
-scsi/*/cd:root:disk:0660
-scsi/*:root:disk:0660
-sd[a-h]*:root:disk:0640
-s[rt][0-9]*:root:disk:0640
-scd*:root:disk:0660
-
-# generic scsi devices
-sg*:root:root:0600
-
-# old CD-ROM
-sbpcd*:root:disk:0640
-
-# loop devices
-loop[0-9]*:root:disk:0660
-
-# network block devices
-nb[0-7]:root:disk:0660
-nht0:root:disk:0640
-npt[0-3]:root:disk:0660
-n[qrs]*:root:disk:0640
-
-# memory access devices
-kmem:root:kmem:0640
-mem:root:kmem:0640
-null:root:sys:0666
-nvram:root:root:0640
-port:root:kmem:0640
-ram[0-9]*:root:disk:0640
-random:root:root:0644
-rtc:root:root:0444
-urandom:root:root:0644
-full:root:sys:0666
-zero:root:root:0664
-raw/*:root:disk:0660
-modreq:root:root:0644
-msr:root:root:0660
-profile*:root:root:0640
-
-# ISDN devices
-isdn*:root:tty:0660
-
-# net devices
-ippp*:root:root:0644
-ipstate:root:root:0660
-spx:root:root:0644
-fwmonitor:root:root:0660
diff --git a/etc/udev/slackware/udev.rules b/etc/udev/slackware/udev.rules
new file mode 100644
index 0000000000..ac43657cc6
--- /dev/null
+++ b/etc/udev/slackware/udev.rules
@@ -0,0 +1,248 @@
+# /etc/udev/udev.rules:  device naming rules for udev
+#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields.  See the udev man page for a full description of them.
+
+# all block devices
+SUBSYSTEM="block", GROUP="disk"
+
+### cdrom symlinks and other good cdrom naming
+##BUS="ide",  KERNEL="hd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+##BUS="scsi", KERNEL="sr[0-9]*", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+##BUS="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+##
+### devfs-names for ide-devices (uncomment only one)
+###  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
+##BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="%c{3}"
+
+# permissions for IDE CD devices
+BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom*", NAME="%k", GROUP="cdrom", MODE="0660"
+
+# permissions for IDE floppy devices
+BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="floppy*", NAME="%k", GROUP="floppy", MODE="0660"
+
+# permissions for SCSI cd/sg/tape devices
+BUS="scsi", KERNEL="s[grt][0-9]*", SYSFS_type="5", NAME="%k", GROUP="cdrom", MODE="0660"
+
+# disk devices
+KERNEL="sd*",		NAME="%k", GROUP="disk"
+KERNEL="dasd*",		NAME="%k", GROUP="disk"
+KERNEL="ataraid*",	NAME="%k", GROUP="disk"
+
+# 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", MODE="0666"
+KERNEL="hw[CD0-9]*",		NAME="snd/%k", MODE="0662"
+KERNEL="pcm[CD0-9]*c",		NAME="snd/%k", MODE="0662"
+KERNEL="pcm[CD0-9]*p",		NAME="snd/%k", MODE="0666"
+KERNEL="midiC[D0-9]*",		NAME="snd/%k", MODE="0666"
+KERNEL="timer",			NAME="snd/%k", MODE="0666"
+KERNEL="seq",			NAME="snd/%k", MODE="0666"
+
+# capi devices
+KERNEL="capi",		NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL="capi*",		NAME="capi/%n"
+
+# cpu devices
+KERNEL="cpu[0-9]*",	NAME="cpu/%n/cpuid"
+KERNEL="msr[0-9]*",	NAME="cpu/%n/msr"
+KERNEL="microcode",	NAME="cpu/microcode"
+
+# dm devices (ignore them)
+KERNEL="dm-[0-9]*",	NAME=""
+# create a symlink named after the device map name
+# note devmap_name comes with extras/multipath
+#KERNEL="dm-[0-9]*",	PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+KERNEL="device-mapper",	NAME="mapper/control"
+
+# fb devices
+KERNEL="fb[0-9]*",	NAME="fb/%n", SYMLINK="%k", GROUP="video"
+
+# floppy devices
+KERNEL="fd[0-9]*", NAME="floppy/%n", SYMLINK="%k", GROUP="floppy", PROGRAM="/etc/udev/scripts/floppy-extra-devs.sh %k %b %n"
+
+# 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="664"
+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"
+
+# ramdisk devices
+KERNEL="ram[0-9]*",	NAME="rd/%n", SYMLINK="%k"
+
+# raw devices
+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", MODE="0662"
+KERNEL="adsp[0-9]*",		NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="audio",			NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="audio[0-9]*",		NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="dsp",			NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="dsp[0-9]*",		NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="mixer",			NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="mixer[0-9]*",		NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="sequencer",		NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+KERNEL="sequencer[0-9]*",	NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0662"
+
+# tty devices
+KERNEL="console",	NAME="%k", GROUP="tty", MODE="0600"
+KERNEL="tty",		NAME="%k", GROUP="tty", MODE="0666"
+KERNEL="tty[0-9]*",	NAME="vc/%n",  SYMLINK="%k", GROUP="tty"
+KERNEL="ttyS[0-9]*",	NAME="tts/%n", SYMLINK="%k", GROUP="tty"
+KERNEL="ttyUSB[0-9]*",	NAME="tts/USB%n", GROUP="tty", MODE="0600"
+KERNEL="ippp0",		NAME="%k", GROUP="tty"
+KERNEL="isdn*",		NAME="%k", GROUP="tty"
+KERNEL="dcbri*",	NAME="%k", GROUP="tty"
+KERNEL="ircomm*",	NAME="%k", GROUP="tty"
+
+# pty devices
+KERNEL="ptmx",			NAME="%k", GROUP="tty", MODE="0666"
+KERNEL="pty[p-za-e][0-9a-f]*",	NAME="pty/m%n", SYMLINK="%k", GROUP="tty"
+KERNEL="tty[p-za-e][0-9a-f]*",	NAME="pty/s%n", SYMLINK="%k", GROUP="tty"
+
+# vc devices
+KERNEL="vcs",		NAME="vcc/0",	SYMLINK="%k", GROUP="tty"
+KERNEL="vcs[0-9]*",	NAME="vcc/%n",	SYMLINK="%k", GROUP="tty"
+KERNEL="vcsa",		NAME="vcc/a0",	SYMLINK="%k", GROUP="tty"
+KERNEL="vcsa[0-9]*",	NAME="vcc/a%n",	SYMLINK="%k", GROUP="tty"
+
+# memory devices
+KERNEL="random",	NAME="%k", MODE="0664"
+KERNEL="urandom",	NAME="%k", MODE="0664"
+KERNEL="mem",		NAME="%k", GROUP="kmem", MODE="0640"
+KERNEL="kmem",		NAME="%k", GROUP="kmem", MODE="0640"
+KERNEL="port",		NAME="%k", GROUP="kmem", 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"
+KERNEL="dabusb*",		NAME="usb/%k"
+BUS="usb", KERNEL="lp[0-9]*",	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", 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
+KERNEL="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c", GROUP="video", MODE="0660"
+
+# Asterix 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"
+
+# tape devices
+KERNEL="ht*",		NAME="%k"
+KERNEL="nht*",		NAME="%k"
+KERNEL="pt*",		NAME="%k"
+KERNEL="npt*",		NAME="%k"
+KERNEL="st*",		NAME="%k"
+KERNEL="nst*",		NAME="%k"
+KERNEL="osst*",		NAME="%k"
+KERNEL="nosst*",	NAME="%k"
+
+# 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="cdrom", MODE="0660"
+KERNEL="pktcdvd[0-9]*",	NAME="pktcdvd/pktcdvd%n", GROUP="cdrom", MODE="0660"
+
+# infiniband devices
+KERNEL="umad*",	NAME="infiniband/%k"
+KERNEL="issm*", NAME="infiniband/%k"
+
+## These lines are causing race conditions with the symlink to udevstart in
+## /etc/hotplug.d/default/, so they are being commented out for now.  Udev
+## seems to work better that way...  YMMV.
+#
+## be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/.
+## systems run /etc/hotplug.d/ stuff only if we came from a hotplug event,
+## not for udevstart
+#ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"
+#
+## always run /etc/dev.d/ stuff for now
+#RUN+="/sbin/udev_run_devd"
+
diff --git a/etc/udev/suse/50-udev.rules b/etc/udev/suse/50-udev.rules
index be5a2478ba..515b572e75 100644
--- a/etc/udev/suse/50-udev.rules
+++ b/etc/udev/suse/50-udev.rules
@@ -185,7 +185,6 @@ KERNEL=="iseries/ibmsis*",	NAME="%k", GROUP="disk"
 
 # device mapper targets
 KERNEL=="device-mapper", ACTION=="add", NAME="%k", SYMLINK+="mapper/control"
-KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/udev.devmap_name.sh %M %m | /bin/sed 's.--._.;s.-./.;s._.-.'", SYMLINK+="%c"
 KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/udev.devmap_name.sh %M %m", NAME="mapper/%c"
 
 # persistent disk device links /dev/disk/
@@ -235,8 +234,9 @@ KERNEL=="tun", NAME="net/%k", MODE="0600"
 SUBSYSTEM=="net", ACTION=="add", RUN+="/sbin/ifup $env{INTERFACE} -o hotplug"
 SUBSYSTEM=="net", ACTION=="remove", RUN+="/sbin/ifdown %k -o hotplug"
 
-# mount usbfs
+# libusb device access (mount usbfs or usbdev nodes)
 DEVPATH=="/module/usbcore", ACTION=="add", RUN+="/bin/mount -t usbfs usbfs /proc/bus/usb"
+SUBSYSTEM="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK="%c"
 
 # firmware loader
 SUBSYSTEM=="firmware", ACTION=="add", RUN+="/etc/hotplug.d/firmware/50-firmware.hotplug"
diff --git a/etc/udev/udev.permissions b/etc/udev/udev.permissions
deleted file mode 100644
index dd56bbec4c..0000000000
--- a/etc/udev/udev.permissions
+++ /dev/null
@@ -1,10 +0,0 @@
-#name:user:group:mode
-ttyUSB0:root:uucp:0660
-ttyUSB1:root:uucp:0666
-pl2303:500:500:0666
-visor:root:uucp:0666
-dsp1:::0666
-camera*:500:500:0666
-sgi_fetchop:root:root:666
-iseries/vcd*:root:disk:660
-iseries/vd*:root:disk:660
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index 6417bbf185..913a88db06 100644
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -1,4 +1,4 @@
-# Makefile for usb_id
+# Makefile for firmware_helper
 #
 # Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
 #