From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 14 Jul 2007 19:01:51 +0000 (+0200)
Subject: rules: SUSE update
X-Git-Tag: 174~1887
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=84654a89135a0044f1abc380b1bd5f8c29637120

rules: SUSE update
---

diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index 32e5008e7..1d57f0a83 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -90,6 +90,7 @@ KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_device
 
 # block devices
 SUBSYSTEM=="block", GROUP="disk", MODE="0640"
+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
 
 # sd:		0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
 # sr:		4 TYPE_WORM, 5 TYPE_ROM
diff --git a/etc/udev/suse/80-drivers.rules b/etc/udev/suse/80-drivers.rules
index 0351b11d3..51c4bf4e9 100644
--- a/etc/udev/suse/80-drivers.rules
+++ b/etc/udev/suse/80-drivers.rules
@@ -1,8 +1,8 @@
 ACTION!="add", GOTO="drivers_end"
 
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe --quiet $env{MODALIAS}"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $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=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /sbin/modprobe 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"