summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-03-25 13:32:22 +0100
committerKay Sievers <kay.sievers@vrfy.org>2008-03-25 13:32:22 +0100
commitddf9cacf611fac839f8417ccc9b86959da90860e (patch)
treeffb8a0446c36c5eba7c1d21263aaf01a689b8161
parent15015a5c9c5fd06d4e236d23f1f6bc45738b0d39 (diff)
rules: remove last WAIT_FOR_SYSFS, load ppdev, switch scsi_device
-rw-r--r--etc/udev/rules.d/05-udev-early.rules5
-rw-r--r--etc/udev/rules.d/80-drivers.rules3
2 files changed, 2 insertions, 6 deletions
diff --git a/etc/udev/rules.d/05-udev-early.rules b/etc/udev/rules.d/05-udev-early.rules
deleted file mode 100644
index 4c3055b626..0000000000
--- a/etc/udev/rules.d/05-udev-early.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# sysfs is populated after the event is sent
-ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-
diff --git a/etc/udev/rules.d/80-drivers.rules b/etc/udev/rules.d/80-drivers.rules
index 534056528d..881d7581bf 100644
--- a/etc/udev/rules.d/80-drivers.rules
+++ b/etc/udev/rules.d/80-drivers.rules
@@ -10,7 +10,8 @@ SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
-SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe ppdev"
LABEL="drivers_end"