update SUSE rules

Tape naming is harder than expected, go back to block devices only.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

2 files changed, 16 insertions, 15 deletions

diff --git a/etc/udev/suse/50-udev.rules b/etc/udev/suse/udev.rules
index 515b572e75..8791e42fc7 100644
--- a/etc/udev/suse/50-udev.rules
+++ b/etc/udev/suse/udev.rules
@@ -188,9 +188,11 @@ KERNEL=="device-mapper", ACTION=="add", NAME="%k", SYMLINK+="mapper/control"
 KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/udev.devmap_name.sh %M %m", NAME="mapper/%c"
 
 # persistent disk device links /dev/disk/
-# skip rules for for ram/loop/fd
-SUBSYSTEM=="block", KERNEL=="ram*|loop*|fd*", GOTO="persistent_end"
 ACTION!="add", GOTO="persistent_end"
+SUBSYSTEM!="block", GOTO="persistent_end"
+
+# skip rules for for ram/loop/fd
+KERNEL=="ram*|loop*|fd*", GOTO="persistent_end"
 
 # never access removable ide devices, the drivers are causing event loops on open()
 SUBSYSTEM=="block", BUS=="ide", SYSFS{removable}="1", GOTO="persistent_end"
@@ -204,16 +206,12 @@ KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", IMPORT="/bin/echo -e 'ID_SERIA
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT="/sbin/usb_id -x"
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -s %p"
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -a -s %p"
-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+KERNEL=="dasd*[!0-9]", IMPORT="/sbin/dasd_id --export $tempnode"
+KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 
 # for partitions import parent information
-KERNEL=="sd*[0-9]", IMPORT{parent}=="ID_*"
-KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
-
-KERNEL=="dasd*[!0-9]", IMPORT="/sbin/dasd_id --export $tempnode"
-KERNEL=="dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-KERNEL=="dasd*[0-9]", IMPORT{parent}=="ID_*"
-KERNEL=="dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+KERNEL=="sd*[0-9]|dasd*[0-9]", IMPORT{parent}=="ID_*"
+KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="$env{ID_TYPE}/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
 
 # by-path (shortest physical path)
 KERNEL=="*[!0-9]", ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PATH}"
@@ -223,10 +221,9 @@ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="$env{ID_TYPE}/by-path/$env{ID_PA
 # by-label/by-uuid (filesystem properties)
 KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end"
 KERNEL=="sr*", GOTO="persistent_end"
-SUBSYSTEM!="block", GOTO="persistent_end"
-KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode"
-KERNEL=="*[0-9]", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-KERNEL=="*[0-9]", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+IMPORT="/sbin/vol_id --export $tempnode"
+ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 LABEL="persistent_end"
 
 # network devices
@@ -257,3 +254,7 @@ RUN+="socket:/org/kernel/udev/monitor"
 # debug events to /events, but not on default udev_log="err"
 ENV{UDEV_LOG}=="[4-9]", RUN+="/sbin/hotplugeventrecorder"
 
+# for backward compatibility with older udev versions and hotplug (no longer supported)
+# RUN+="/sbin/udev_run_hotplugd"
+# RUN+="/sbin/udev_run_devd"
+
diff --git a/udevmonitor.c b/udevmonitor.c
index 51e8a2ab0b..3a71d002f5 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -28,8 +28,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/select.h>
+#include <linux/types.h>
 #include <linux/netlink.h>
-#include <asm/types.h>
 
 #include "udev.h"
 #include "udevd.h"