From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 5 Jul 2007 20:48:36 +0000 (+0200)
Subject: rules: SUSE update
X-Git-Tag: 174~1894
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2e23125e112c0a56e1ccee193c2cfe0e26af1bad

rules: SUSE update
---

diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index d8598276f..32e5008e7 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -96,11 +96,7 @@ SUBSYSTEM=="block", GROUP="disk", MODE="0640"
 # st/osst:	1 TYPE_TAPE
 SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
 SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
-SUBSYSTEM=="scsi_device", ACTION=="add", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
-SUBSYSTEM=="scsi_device", ACTION=="add", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
-SUBSYSTEM=="mmc", ACTION=="add", RUN+="/sbin/modprobe mmc_block"
 
 # misc storage devices (non-block)
 KERNEL=="sg*",			GROUP="disk", MODE="0640"
diff --git a/etc/udev/suse/80-drivers.rules b/etc/udev/suse/80-drivers.rules
new file mode 100644
index 000000000..0351b11d3
--- /dev/null
+++ b/etc/udev/suse/80-drivers.rules
@@ -0,0 +1,13 @@
+ACTION!="add", GOTO="drivers_end"
+
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe --quiet $env{MODALIAS}"
+
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe --quiet pnp:d$$id; done < /sys$devpath/id'"
+
+SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --quiet -all tifm_sd tifm_ms"
+SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
+SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
+SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
+
+LABEL="drivers_end"