Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay

[elogind.git] / etc / udev / redhat / udev.rules

diff --git a/etc/udev/redhat/udev.rules b/etc/udev/redhat/udev.rules
index ad60d1a81d0d1b2e598cf67b9dd099d0d5204123..5bed78228091bcf4086fd8e1d16376d84133a0f3 100644 (file)
--- a/etc/udev/redhat/udev.rules
+++ b/etc/udev/redhat/udev.rules
@@ -1,7 +1,7 @@
 # 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.
 #
-# default is OWNER="root" GROUP="root", MODE="0600"
+# default is OWNER="root" GROUP="root", MODE="0660"
 #
 
 # all block devices
@@ -119,7 +119,7 @@ KERNEL=="vttuner",          MODE="0660"
 KERNEL=="v4l/*",               MODE="0660"
 
 # input devices
-KERNEL=="input/*",             MODE="0644"
+KERNEL=="input/*",             MODE="0660"
 
 # gpm devices
 KERNEL=="gpmctl",              MODE="0700"
@@ -195,8 +195,18 @@ KERNEL=="sr[0-9]*",                SYMLINK="cdrom%e"
 KERNEL=="scd[0-9]*",           SYMLINK="cdrom%e"
 KERNEL=="pcd[0-9]*",           SYMLINK="cdrom%e"
 KERNEL=="fd[0-9]*",            SYMLINK="floppy%e"
-KERNEL=="nst[0-9]",            SYMLINK="tape%e"
-KERNEL=="nosst[0-9]*",         SYMLINK="tape%e"
+KERNEL=="nst[0-9]", BUS=="scsi",       SYMLINK="tape%e"
+KERNEL=="nosst[0-9]", BUS=="scsi",     SYMLINK="tape%e"
+
+KERNEL=="umad*",               NAME="infiniband/%k"
+KERNEL=="issm*",               NAME="infiniband/%k"
+
+# Section for zaptel device
+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"
 
 # do not seperate the next 2 lines!!
 KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/ide-media.sh %k", RESULT=="floppy", SYMLINK="floppy%e", NAME{ignore_remove, all_partitions}="%k"