rules: Fedora update

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

diff --git a/etc/udev/redhat/50-udev.rules b/etc/udev/redhat/50-udev.rules
index 6dc8768f85d7a65a3296d8f57387aaa8a31b2572..c410e8575adc3fc6d9514bfbfeab9217346f2a42 100644 (file)
--- 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"
@@ -68,9 +65,6 @@ 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
@@ -212,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"
 
@@ -233,6 +227,7 @@ KERNEL=="zap[0-9]*",                NAME="zap/%n"
 
 KERNEL=="pktcdvd", NAME="%k/control"
 
+
 KERNEL=="hd*[!0-9]", ATTR{removable}=="1", \
        ATTR{media}=="floppy", \
        SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions"
@@ -255,6 +250,7 @@ KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \
        OPTIONS+="ignore_remove"
 
 
+
 #######################################
 # Persistent block device stuff - begin
 #######################################
@@ -280,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
@@ -315,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+="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
@@ -351,5 +343,6 @@ ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS
 # mmc block devices
 ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block"
 
+
 RUN+="socket:/org/kernel/udev/monitor"