X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=etc%2Fudev%2Fredhat%2F50-udev.rules;h=6dc8768f85d7a65a3296d8f57387aaa8a31b2572;hb=1a4144498aaf4a457d3dd03c25ccb9b8e1f848c7;hp=64c91fc5cb3e68d4b0dec08b3307838c4cf25cf7;hpb=9a8ad783a48791c5eaa35697d0a4befd705085fd;p=elogind.git

diff --git a/etc/udev/redhat/50-udev.rules b/etc/udev/redhat/50-udev.rules
index 64c91fc5c..6dc8768f8 100644
--- a/etc/udev/redhat/50-udev.rules
+++ b/etc/udev/redhat/50-udev.rules
@@ -41,9 +41,9 @@ KERNEL=="modems/mwave*",        NAME="%k", GROUP="uucp", MODE="0660"
 KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
 KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
 KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB*", SYSFS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", ATTRS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", ATTRS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", ATTRS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660"
 
 # vc devices
 KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
@@ -68,13 +68,18 @@ KERNEL=="hw_random",            NAME="hwrng", SYMLINK+="%k"
 KERNEL=="nvram",		MODE="0660"
 KERNEL=="rtc",			MODE="0644"
 
+# pnp devices
+ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
+
 # floppy devices
 KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
 # fix floppy devices
 KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
-KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
 KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
 
+BUS=="usb", KERNEL=="sd*", SYSFS{bInterfaceClass}=="08", SYSFS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", SYMLINK+="floppy floppy-%k"
+
 # audio devices
 KERNEL=="dsp*",			MODE="0660"
 KERNEL=="audio*",		MODE="0660"
@@ -100,6 +105,8 @@ KERNEL=="usblp*",		GROUP="lp", MODE="0660"
 KERNEL=="usb/lp*",		GROUP="lp", MODE="0660"
 
 # tape devices
+SUBSYSTEM=="ide", SYSFS{media}=="tape", ACTION=="add", \
+		RUN+="modprobe ide-scsi idescsi_nocd=1"
 KERNEL=="ht*",			GROUP="disk", MODE="0660"
 KERNEL=="nht*",			GROUP="disk", MODE="0660"
 KERNEL=="pt[0-9]*",		GROUP="disk", MODE="0660"
@@ -150,16 +157,14 @@ KERNEL=="usb/rio500",		MODE="0660"
 
 # s390 devices
 KERNEL=="z90crypt",		MODE="0666"
+KERNEL=="slram[0-9]*", 		SYMLINK+="xpram%n"
 
 # DVB
 KERNEL=="dvb",			MODE="0660"
 SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \
 	NAME="%c", MODE="0660"
 
-# 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=="dm-[0-9]*", ACTION=="add",           OPTIONS+="ignore_device"
 
 # alsa devices
 KERNEL=="controlC[0-9]*",	NAME="snd/%k"
@@ -175,6 +180,7 @@ KERNEL=="mouse*",		NAME="input/%k"
 KERNEL=="event*",		NAME="input/%k"
 KERNEL=="js*",			NAME="input/%k", SYMLINK+="%k"
 KERNEL=="ts*",			NAME="input/%k"
+KERNEL=="uinput",          	NAME="input/%k"
 
 # IEEE1394 (firewire) devices (must be before raw devices below)
 KERNEL=="raw1394",      	NAME="%k"
@@ -214,15 +220,9 @@ KERNEL=="device-mapper",	NAME="mapper/control"
 KERNEL=="sr[0-9]*",		SYMLINK+="cdrom cdrom-%k"
 KERNEL=="scd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
 KERNEL=="pcd[0-9]*",		SYMLINK+="cdrom cdrom-%k"
-KERNEL=="fd[0-9]*",		SYMLINK+="floppy-%k"
-KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
-KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape-%k", MODE="0660"
-
-KERNEL=="umad*", 		NAME="infiniband/%k", MODE="0660"
-KERNEL=="issm*", 		NAME="infiniband/%k", MODE="0660"
-KERNEL=="uverbs*",              NAME="infiniband/%k", MODE="0660"
-KERNEL=="ucm*",                 NAME="infiniband/%k", MODE="0660"
-KERNEL=="rdma_cm",              NAME="infiniband/%k", MODE="0660"
+KERNEL=="fd[0-9]*",		SYMLINK+="floppy floppy-%k"
+KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape tape-%k", MODE="0660"
+KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape tape-%k", MODE="0660"
 
 # Section for zaptel device
 KERNEL=="zapctl",     		NAME="zap/ctl"
@@ -233,24 +233,25 @@ KERNEL=="zap[0-9]*",  		NAME="zap/%n"
 
 KERNEL=="pktcdvd", NAME="%k/control"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
-	SYSFS{device/media}=="floppy", \
+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", \
+	ATTR{media}=="floppy", \
 	SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
+KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", SYMLINK+="floppy-%k"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
 KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
 KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
 KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k"
 
 # rename sr* to scd*
 KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
-KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \
+KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \
 	OPTIONS+="ignore_remove"
 
 
@@ -264,18 +265,18 @@ ACTION!="add", GOTO="persistent_end"
 SUBSYSTEM!="block", GOTO="persistent_end"
 
 # skip rules for inappropriate block devices
-KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end"
+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", GOTO="persistent_end"
 
 # never access removable ide devices, the drivers are causing event loops on open()
-BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1",	GOTO="persistent_end"
-BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end"
+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_end"
+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
 
 # by-id (hardware serial number)
 KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode"
 KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
 KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
 
-KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
+KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
@@ -293,7 +294,7 @@ KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
 KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
 
 # by-label/by-uuid (filesystem properties)
-KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end"
+KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
 IMPORT{program}="/lib/udev/vol_id --export $tempnode"
 ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
 ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
@@ -314,7 +315,7 @@ ACTION=="add", SUBSYSTEM=="usb_device", \
 	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
 	NAME="%c", MODE="0644"
 
-ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}"
 
 ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
 
@@ -322,30 +323,33 @@ ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo
 # sr:           4 TYPE_WORM, 5 TYPE_ROM
 # st/osst:      1 TYPE_TAPE
 # sg: 		8 changer, [36] scanner
-ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="0|7|14", \
+ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="0|7|14", \
 	RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
-ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="1", \
+ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="1", \
 	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
 
 
-ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
-	RUN+="/sbin/modprobe sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \
-	RUN+="/sbin/modprobe sr_mod"
+ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="modprobe sg"
+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \
+	RUN+="modprobe sd_mod"
+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \
+	RUN+="modprobe sr_mod"
 
-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \
+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
 	SYMLINK+="scanner scanner-%k", MODE="0660"
 
-ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \
+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \
 	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
 
-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
-	SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
-	SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
-ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
-	RUN+="/sbin/modprobe st"
+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+	ATTRS{model}!="ADR*", RUN+="modprobe osst"
+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+	ATTRS{model}=="ADR*", RUN+="modprobe st"
+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \
+	RUN+="modprobe st"
+
+# mmc block devices
+ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
 
 RUN+="socket:/org/kernel/udev/monitor"