rules: SUSE update

3 files changed, 38 insertions, 37 deletions

diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index 3a6a8a975c..4a74bbb6d6 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -1,12 +1,10 @@
 # console
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="vcs*",			GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="vcsa*",		GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="tty",			GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="tty[0-9]*",		GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="console",		MODE="600", OPTIONS="last_rule"
-KERNEL=="ptmx",			GROUP="tty", MODE="666", OPTIONS="last_rule"
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty[0-9]*|vcs*",	GROUP="tty", MODE="0620", OPTIONS="last_rule"
+KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
 
 # serial devices
 KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
@@ -32,11 +30,9 @@ KERNEL=="pmu",			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=="mouse*|mice",		NAME="input/%k", MODE="0640"
-KERNEL=="event*",		NAME="input/%k", MODE="0640"
+KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
 KERNEL=="js*",			NAME="input/%k", MODE="0644"
-KERNEL=="ts*",			NAME="input/%k", MODE="0600"
-KERNEL=="uinput",		NAME="input/%k", MODE="0600"
+KERNEL=="ts*|uinput",		NAME="input/%k", MODE="0600"
 KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # printer
@@ -62,29 +58,26 @@ KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 KERNEL=="tun",			NAME="net/%k", MODE="0666"
 
 # misc devices
-KERNEL=="mem|kmem",		GROUP="kmem", MODE="640"
-KERNEL=="port",			GROUP="kmem", MODE="640"
-KERNEL=="nvram",		GROUP="kmem", MODE="600"
-KERNEL=="null",			MODE="666"
-KERNEL=="zero",			MODE="666"
-KERNEL=="full",			MODE="622"
-KERNEL=="random",		MODE="666"
-KERNEL=="urandom",		MODE="644"
-KERNEL=="rtc",			MODE="600"
+KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
+KERNEL=="nvram",		GROUP="kmem", MODE="0600"
+KERNEL=="null|zero|random",	MODE="0666"
+KERNEL=="full",			MODE="0622"
+KERNEL=="urandom",		MODE="0644"
+KERNEL=="rtc",			MODE="0600"
 KERNEL=="fuse",			MODE="0666"
 KERNEL=="sonypi",		MODE="0666"
 KERNEL=="agpgart",		MODE="0600", GROUP="video"
-KERNEL=="djs*",			MODE="644"
-KERNEL=="sgi_*",		MODE="666"
-KERNEL=="rrom*",		MODE="400"
-KERNEL=="rflash*",		MODE="400"
-KERNEL=="usbscanner*",		MODE="644"
-KERNEL=="3270/ttycons*",	MODE="600"
-KERNEL=="3270/tub*",		MODE="666"
-KERNEL=="3270/tubcons*",	MODE="600"
-KERNEL=="ica",			MODE="666"
-KERNEL=="z90crypt",		MODE="666"
-KERNEL=="mmtimer",		MODE="644"
+KERNEL=="djs*",			MODE="0644"
+KERNEL=="sgi_*",		MODE="0666"
+KERNEL=="rrom*",		MODE="0400"
+KERNEL=="rflash*",		MODE="0400"
+KERNEL=="usbscanner*",		MODE="0644"
+KERNEL=="3270/ttycons*",	MODE="0600"
+KERNEL=="3270/tub*",		MODE="0666"
+KERNEL=="3270/tubcons*",	MODE="0600"
+KERNEL=="ica",			MODE="0666"
+KERNEL=="z90crypt",		MODE="0666"
+KERNEL=="mmtimer",		MODE="0644"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 
 # packet writing interface
@@ -112,7 +105,7 @@ SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-s
 SUBSYSTEM=="mmc", ACTION=="add", RUN+="/sbin/modprobe mmc_block"
 
 # misc storage devices (non-block)
-KERNEL=="sg*",			GROUP="disk", MODE="640"
+KERNEL=="sg*",			GROUP="disk", MODE="0640"
 KERNEL=="st*|nst*",		GROUP="disk"
 KERNEL=="qft*|nqft*|zqft*|nzqft*|rawqft*|nrawqft", GROUP="disk"
 KERNEL=="ht*|nht*",		GROUP="disk"
diff --git a/etc/udev/suse/64-device-mapper.rules b/etc/udev/suse/64-device-mapper.rules
index a84b1077d0..2c63b1fb70 100644
--- a/etc/udev/suse/64-device-mapper.rules
+++ b/etc/udev/suse/64-device-mapper.rules
@@ -7,12 +7,16 @@ KERNEL!="dm-*", GOTO="device_mapper_end"
 ACTION!="add|change", GOTO="device_mapper_end"
 
 # skip snapshot and error tables
-PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
-RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end"
+IMPORT{program}="/sbin/dmsetup export -j%M -m%m"
+ENV{DM_STATE}!="ACTIVE", GOTO="device_mapper_end"
+ENV{DM_TARGET_TYPES}=="|*snapshot*|*error*", GOTO="device_mapper_end"
+
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
+ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
 
 IMPORT{program}="vol_id --export $tempnode"
 OPTIONS="link_priority=-100"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_SAFE}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_SAFE}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 LABEL="device_mapper_end"
diff --git a/etc/udev/suse/64-md-raid.rules b/etc/udev/suse/64-md-raid.rules
index 39af3ef6be..4745deb0e9 100644
--- a/etc/udev/suse/64-md-raid.rules
+++ b/etc/udev/suse/64-md-raid.rules
@@ -6,9 +6,13 @@ ACTION!="add|change", GOTO="md_end"
 
 ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
 
+#IMPORT{program}="/sbin/mdadm -D --export $tempnode"
+ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}"
+ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
+
 IMPORT{program}="vol_id --export $tempnode"
 OPTIONS="link_priority=100"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_SAFE}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_SAFE}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 LABEL="md_end"