X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=etc%2Fudev%2Fredhat%2F50-udev.rules;h=c410e8575adc3fc6d9514bfbfeab9217346f2a42;hb=34ee018186c8af32552a289cf904ba5c98100b99;hp=d72cb83472f77cb90621428b54c308dc7ebe637d;hpb=71f178cf2437977ad606e160249f44c73bca87d8;p=elogind.git

diff --git a/etc/udev/redhat/50-udev.rules b/etc/udev/redhat/50-udev.rules
index d72cb8347..c410e8575 100644
--- a/etc/udev/redhat/50-udev.rules
+++ b/etc/udev/redhat/50-udev.rules
@@ -41,9 +41,6 @@ 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*", 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"
@@ -75,6 +72,8 @@ KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
 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 +99,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"
@@ -157,7 +158,7 @@ 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"
 
-KERNEL=="dm-[0-9]*",            OPTIONS+="ignore_device"
+KERNEL=="dm-[0-9]*", ACTION=="add",           OPTIONS+="ignore_device"
 
 # alsa devices
 KERNEL=="controlC[0-9]*",	NAME="snd/%k"
@@ -173,6 +174,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"
@@ -204,7 +206,7 @@ KERNEL=="tty0",			SYMLINK+="systty"
 KERNEL=="vbi0",			SYMLINK+="vbi"
 KERNEL=="null",			SYMLINK+="XOR"
 
-KERNEL=="tun",			NAME="net/%k"
+KERNEL=="tun",			NAME="net/%k", MODE="0666"
 
 KERNEL=="device-mapper",	NAME="mapper/control"
 
@@ -212,15 +214,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"
@@ -231,9 +227,11 @@ KERNEL=="zap[0-9]*",  		NAME="zap/%n"
 
 KERNEL=="pktcdvd", NAME="%k/control"
 
-KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \
-	ATTRS{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", ATTRS{removable}=="1", ATTRS{media}=="cdrom", SYMLINK+="cdrom cdrom-%k"
 
@@ -252,6 +250,7 @@ KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \
 	OPTIONS+="ignore_remove"
 
 
+
 #######################################
 # Persistent block device stuff - begin
 #######################################
@@ -265,8 +264,8 @@ SUBSYSTEM!="block", 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", DRIVERS!="ide-cdrom", ATTRS{removable}=="1",	GOTO="persistent_end"
-BUS=="ide", KERNEL=="hd*[0-9]", ATTRS{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"
@@ -277,7 +276,6 @@ KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{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"
-KERNEL=="dasd*[!0-9]", IMPORT{program}="/lib/udev/dasd_id --export $tempnode"
 KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 
 # for partitions import parent information
@@ -312,9 +310,6 @@ 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=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
 
 # sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
 # sr:           4 TYPE_WORM, 5 TYPE_ROM
@@ -326,11 +321,11 @@ 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"	RUN+="modprobe sg"
 ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \
-	RUN+="/sbin/modprobe sd_mod"
+	RUN+="modprobe sd_mod"
 ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \
-	RUN+="/sbin/modprobe sr_mod"
+	RUN+="modprobe sr_mod"
 
 ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \
 	SYMLINK+="scanner scanner-%k", MODE="0660"
@@ -339,14 +334,15 @@ ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \
 	SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
 
 ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-	ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst"
+	ATTRS{model}!="ADR*", RUN+="modprobe osst"
 ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
-	ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st"
+	ATTRS{model}=="ADR*", RUN+="modprobe st"
 ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \
-	RUN+="/sbin/modprobe st"
+	RUN+="modprobe st"
 
 # mmc block devices
-ACTION=="add", SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
+
 
 RUN+="socket:/org/kernel/udev/monitor"