From d69b2203c37d32bbfbd81153a1fc99b55b7b6cbb Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@suse.de>
Date: Fri, 23 Dec 2005 00:13:34 +0100
Subject: [PATCH] update SUSE rules

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---
 etc/udev/{persistent.rules => persistent-disk.rules} | 3 ++-
 etc/udev/suse/05-udev-early.rules                    | 1 +
 etc/udev/suse/50-udev-default.rules                  | 5 +----
 etc/udev/suse/80-sysconfig.rules                     | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename etc/udev/{persistent.rules => persistent-disk.rules} (94%)

diff --git a/etc/udev/persistent.rules b/etc/udev/persistent-disk.rules
similarity index 94%
rename from etc/udev/persistent.rules
rename to etc/udev/persistent-disk.rules
index 0b231aacd..3515bb189 100644
--- a/etc/udev/persistent.rules
+++ b/etc/udev/persistent-disk.rules
@@ -43,5 +43,6 @@ KERNEL=="*[!0-9]", IMPORT{program}="/sbin/edd_id --export $tempnode"
 KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
 KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
 
-LABEL="persistent_end"
+KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", SYMLINK="disk/by-name/%c"
 
+LABEL="persistent_end"
diff --git a/etc/udev/suse/05-udev-early.rules b/etc/udev/suse/05-udev-early.rules
index ce159d56d..dfdbdff0c 100644
--- a/etc/udev/suse/05-udev-early.rules
+++ b/etc/udev/suse/05-udev-early.rules
@@ -1,5 +1,6 @@
 # sysfs is populated after the event is sent
 ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 
 # ignore these events until someone needs them
 SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index 09f197da2..fe861ae97 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -33,7 +33,7 @@ KERNEL=="vbi0",			SYMLINK+="vbi"
 KERNEL=="pmu",			GROUP="video"
 
 # dvb
-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # input devices
 KERNEL=="mice",			NAME="input/%k", MODE="0640"
@@ -127,9 +127,6 @@ SUBSYSTEM=="ide", ACTION=="add", RUN+="ide.sh"
 # device mapper
 KERNEL=="device-mapper", NAME="%k", SYMLINK+="mapper/control"
 
-# check fstab and possibly mount
-SUBSYSTEM=="block", ACTION=="add", KERNEL=="sd*[0-9]|hd*[0-9]", RUN+="mount.sh"
-
 # misc storage devices (non-block)
 KERNEL=="sg*",			NAME="%k", GROUP="disk", MODE="640"
 KERNEL=="st*",			NAME="%k", GROUP="disk"
diff --git a/etc/udev/suse/80-sysconfig.rules b/etc/udev/suse/80-sysconfig.rules
index 7073813c6..d6778647b 100644
--- a/etc/udev/suse/80-sysconfig.rules
+++ b/etc/udev/suse/80-sysconfig.rules
@@ -9,7 +9,7 @@ SUBSYSTEM=="pci", ACTION=="add", RUN+="/sbin/hwup bus-pci-%k -o hotplug"
 SUBSYSTEM=="usb", ACTION=="add", RUN+="/sbin/hwup usb-devpath-%p -o hotplug"
 SUBSYSTEM=="ieee1394", ACTION=="add", RUN+="/sbin/hwup ieee1394-devpath-%p -o hotplug"
 SUBSYSTEM=="scsi", DEVPATH=="/devices/css*", ACTION=="remove", RUN+="/sbin/hwdown scsi-devpath-%p -o hotplug"
-SUBSYSTEM=="scsi_host", ACTION=="add", SYSFS{device/cutype}=="?*", RUN+="/sbin/hwup scsi__host-devpath-%p -o hotplug"
+SUBSYSTEM=="scsi_host", ACTION=="add", SYSFS{proc_name}=="zfcp", RUN+="/sbin/hwup scsi_host-devpath-%p -o hotplug"
 SUBSYSTEM=="vio", ACTION=="add", RUN+="/sbin/hwup bus-macio-%k -o hotplug"
 SUBSYSTEM=="macio", ACTION=="add", RUN+="/sbin/hwup bus-macio-%k -o hotplug"
 SUBSYSTEM=="ccw", ACTION=="add", RUN+="/sbin/hwup ccw-devpath-%p -o hotplug"
-- 
2.30.2