summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2007-05-03 02:12:18 +0200
committerKay Sievers <kay.sievers@vrfy.org>2007-05-03 02:12:18 +0200
commit34ee018186c8af32552a289cf904ba5c98100b99 (patch)
treec8b8bb98c2ff507b5e3ffc49e4e9ffa3d5d70604
parent8d8a237425ad45818e6747f20e0564afaa3e5ad4 (diff)
rules: Fedora update
-rw-r--r--etc/udev/redhat/05-udev-early.rules6
-rw-r--r--etc/udev/redhat/50-udev.rules2
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/udev/redhat/05-udev-early.rules b/etc/udev/redhat/05-udev-early.rules
index c3024569fe..a58cc033d2 100644
--- a/etc/udev/redhat/05-udev-early.rules
+++ b/etc/udev/redhat/05-udev-early.rules
@@ -5,13 +5,15 @@ SUBSYSTEM=="drivers", OPTIONS="ignore_device"
SUBSYSTEM=="module", OPTIONS="ignore_device"
-ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", OPTIONS="last_rule"
+ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}", GOTO="skip_wait"
# pnp devices
-ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'", OPTIONS="last_rule"
+ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'"
ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+LABEL="skip_wait"
+
ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
diff --git a/etc/udev/redhat/50-udev.rules b/etc/udev/redhat/50-udev.rules
index 9e946dae25..c410e8575a 100644
--- a/etc/udev/redhat/50-udev.rules
+++ b/etc/udev/redhat/50-udev.rules
@@ -206,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"