From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 3 May 2007 00:12:18 +0000 (+0200)
Subject: rules: Fedora update
X-Git-Tag: 174~1973
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34ee018186c8af32552a289cf904ba5c98100b99;p=systemd

rules: Fedora update
---

diff --git a/etc/udev/redhat/05-udev-early.rules b/etc/udev/redhat/05-udev-early.rules
index c3024569..a58cc033 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 9e946dae..c410e857 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"