summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/udev/suse/05-udev-early.rules1
-rw-r--r--etc/udev/suse/40-alsa.rules16
-rw-r--r--etc/udev/suse/40-bluetooth.rules82
-rw-r--r--etc/udev/suse/50-pcmcia.rules5
-rw-r--r--etc/udev/suse/50-udev-default.rules139
-rw-r--r--etc/udev/suse/60-persistent-storage.rules2
-rw-r--r--etc/udev/suse/64-device-mapper.rules8
-rw-r--r--etc/udev/suse/80-sysconfig.rules17
8 files changed, 66 insertions, 204 deletions
diff --git a/etc/udev/suse/05-udev-early.rules b/etc/udev/suse/05-udev-early.rules
index 417ee67d6f..4dc497bac2 100644
--- a/etc/udev/suse/05-udev-early.rules
+++ b/etc/udev/suse/05-udev-early.rules
@@ -1,4 +1,3 @@
# sysfs is populated after the event is sent
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
diff --git a/etc/udev/suse/40-alsa.rules b/etc/udev/suse/40-alsa.rules
deleted file mode 100644
index 87097a49e0..0000000000
--- a/etc/udev/suse/40-alsa.rules
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBSYSTEM=="sound", GROUP="audio"
-SUBSYSTEM=="snd", GROUP="audio"
-KERNEL=="controlC[0-9]*", NAME="snd/%k"
-KERNEL=="hwC[D0-9]*", NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k"
-KERNEL=="midiC[D0-9]*", NAME="snd/%k"
-KERNEL=="timer", NAME="snd/%k"
-KERNEL=="seq", NAME="snd/%k"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8000/*", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us428fw.ihx"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8004/*", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us224fw.ihx"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8006/*", RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx -I /usr/share/alsa/firmware/usx2yloader/us122fw.ihx"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8001/*", RUN+="/sbin/startproc /usr/bin/us428control"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8005/*", RUN+="/sbin/startproc /usr/bin/us428control"
-SUBSYSTEM=="sound", KERNEL=="controlC?", RUN+="/usr/sbin/alsactl -F restore %n"
-SUBSYSTEM=="sound", KERNEL=="hwC?D2", DRIVER=="EMU10K1_Audigy", RUN+="/etc/alsa.d/udev-soundfont"
-
diff --git a/etc/udev/suse/40-bluetooth.rules b/etc/udev/suse/40-bluetooth.rules
deleted file mode 100644
index b6d706cabf..0000000000
--- a/etc/udev/suse/40-bluetooth.rules
+++ /dev/null
@@ -1,82 +0,0 @@
-# bluetooth subsystem
-SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
-
-# uncomment this if you have configured an automatic rfcomm-bind in
-# /etc/bluetooth/rfcomm.conf
-# KERNEL=="rfcomm*", NAME="%k" GROUP="uucp" MODE="0660" OPTIONS="resmgr"
-
-## PCMCIA-Cards
-# "Brain Boxes BL-620 Bluetooth Adapter"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Brain Boxes", SYSFS{prod_id2}=="Bluetooth PC Card", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Xircom CreditCard Bluetooth Adapter"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Xircom RealPort2 Bluetooth Adapter"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", RUN+="/etc/pcmcia/bluetooth.sh"
-# "IBM Bluetooth PC Card II"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="IBM", SYSFS{prod_id2}=="Bluetooth PC Card II", RUN+="/etc/pcmcia/bluetooth.sh"
-# "TDK Bluetooth PC Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="TDK", SYSFS{prod_id2}=="Bluetooth PC Card II", RUN+="/etc/pcmcia/bluetooth.sh"
-# "AmbiCom BT2000C Bluetooth PC/CF Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="AmbiCom BT2000C", SYSFS{prod_id2}=="Bluetooth PC/CF Card", RUN+="/etc/pcmcia/bluetooth.sh"
-# "COM One Platinium Bluetooth PC Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="COM1 SA", SYSFS{prod_id2}=="MC310 CARD", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Sphinx PICO Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="SPHINX", SYSFS{prod_id2}=="BT-CARD", RUN+="/etc/pcmcia/bluetooth.sh"
-# "H-Soft blue+Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="H-Soft", SYSFS{prod_id2}=="Blue+CARD", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Compaq iPAQ Bluetooth Sleeve"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="CF CARD", SYSFS{prod_id2}=="GENERIC", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Zoom Bluetooth Card"
-# "Sitecom CN-504 Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="PCMCIA", SYSFS{prod_id2}=="Bluetooth Card", RUN+="/etc/pcmcia/bluetooth.sh"
-
-
-#
-# dtl1_cs
-#
-# card "Nokia Bluetooth Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Nokia Mobile Phones", SYSFS{prod_id2}=="DTL-1", RUN+="/etc/pcmcia/bluetooth.sh"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Nokia Mobile Phones", SYSFS{prod_id2}=="DTL-4", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Socket Bluetooth Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Socket", SYSFS{prod_id2}=="CF+ Personal Network Card", RUN+="/etc/pcmcia/bluetooth.sh"
-
-
-#
-# bt3c_cs
-#
-
-# "3Com Bluetooth PC Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="3COM", SYSFS{prod_id3}=="Bluetooth PC Card", RUN+="/etc/pcmcia/bluetooth.sh"
-
-#
-# bluecard_cs
-#
-
-# "LSE041 Bluetooth PC Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="BlueCard", SYSFS{prod_id2}=="LSE041", RUN+="/etc/pcmcia/bluetooth.sh"
-# "LSE039 Bluetooth Compact Flash Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="WSS", SYSFS{prod_id2}=="LSE039", RUN+="/etc/pcmcia/bluetooth.sh"
-# "LSE139 Bluetooth Compact Flash Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="BTCFCARD", SYSFS{prod_id2}=="LSE139", RUN+="/etc/pcmcia/bluetooth.sh"
-
-
-#
-# bt950_cs
-#
-
-# "AmbiCom BT2000E Bluetooth Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="AmbiCom,Inc", SYSFS{prod_id2}=="BT2000E", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Pretec BT2000E Bluetooth Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Pretec", SYSFS{prod_id2}=="BT2000E", RUN+="/etc/pcmcia/bluetooth.sh"
-# "Billionton Bluetooth Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="Compact Flash", SYSFS{prod_id2}=="Bluetooth Card", RUN+="/etc/pcmcia/bluetooth.sh"
-
-
-#
-# btuart_cs
-#
-
-# "Cyber-blue Compact Flash Card"
-SUBSYSTEM=="tty", ENV{PHYSDEVBUS}=="pcmcia", SYSFS{prod_id1}=="BT", SYSFS{prod_id2}=="", SYSFS{prod_id3}=="", SYSFS{prod_id4}=="", RUN+="/etc/pcmcia/bluetooth.sh"
-
-
diff --git a/etc/udev/suse/50-pcmcia.rules b/etc/udev/suse/50-pcmcia.rules
deleted file mode 100644
index 11ccde56e7..0000000000
--- a/etc/udev/suse/50-pcmcia.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBSYSTEM=="pcmcia_socket", ACTION=="add", RUN+="/sbin/hwup pcmcia_socket-devpath-%p -o hotplug"
-SUBSYSTEM=="pcmcia", ACTION=="add", RUN+="/sbin/hwup pcmcia-devpath-%p -o hotplug"
-
-LABEL="after_pcmcia"
-
diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index 920d4706fd..021f7ec0e0 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -1,33 +1,30 @@
# console
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="vcs*", NAME="%k", GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="vcsa*", NAME="%k", GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="tty", NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="tty[0-9]*", NAME="%k", GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="console", NAME="%k", MODE="600", OPTIONS="last_rule"
-KERNEL=="ptmx", NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
+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"
# serial devices
-KERNEL=="tty[A-Z]*", NAME="%k", GROUP="uucp"
-KERNEL=="pppox*", NAME="%k", GROUP="uucp"
-KERNEL=="ircomm*", NAME="%k", GROUP="uucp"
-KERNEL=="modems/mwave*", NAME="%k", GROUP="uucp"
-KERNEL=="hvc*", NAME="%k", GROUP="uucp"
-KERNEL=="hvsi*", NAME="%k", GROUP="uucp"
-KERNEL=="iseries/vtty*", NAME="%k", GROUP="uucp"
+KERNEL=="tty[A-Z]*", GROUP="uucp"
+KERNEL=="pppox*", GROUP="uucp"
+KERNEL=="ircomm*", GROUP="uucp"
+KERNEL=="modems/mwave*", GROUP="uucp"
+KERNEL=="hvc*|hvsi*", GROUP="uucp"
+KERNEL=="iseries/vtty*", GROUP="uucp"
KERNEL=="ttyUSB*", SYSFS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot"
KERNEL=="ttyUSB*", SYSFS{product}=="[Hh]andspring*Treo*|[Hh]andspring*Visor*", SYMLINK+="pilot"
# video/graphics
SUBSYSTEM=="video4linux", GROUP="video"
SUBSYSTEM=="graphics" GROUP="video"
-KERNEL=="vtx*", NAME="%k", GROUP="video"
-KERNEL=="vbi*", NAME="%k", GROUP="video"
-KERNEL=="winradio*", NAME="%k", GROUP="video"
-KERNEL=="vttuner*", NAME="%k", GROUP="video"
-KERNEL=="nvidia*", NAME="%k", GROUP="video"
-KERNEL=="nvidiactl*", NAME="%k", GROUP="video"
+KERNEL=="vtx*|vbi*", GROUP="video"
+KERNEL=="winradio*", GROUP="video"
+KERNEL=="vttuner*", GROUP="video"
+KERNEL=="nvidia*|nvidiactl*", GROUP="video"
KERNEL=="video0", SYMLINK+="video"
KERNEL=="radio0", SYMLINK+="radio"
KERNEL=="vbi0", SYMLINK+="vbi"
@@ -37,18 +34,17 @@ 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=="mice", NAME="input/%k", MODE="0640"
-KERNEL=="mouse*", NAME="input/%k", MODE="0640"
+KERNEL=="mouse*|mice", NAME="input/%k", MODE="0640"
KERNEL=="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=="lirc0", NAME="%k", SYMLINK+="lirc"
+KERNEL=="lirc0", SYMLINK+="lirc"
# printer
SUBSYSTEM=="usb", KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
-SUBSYSTEM=="printer", KERNEL=="lp*", NAME="%k", GROUP="lp"
-KERNEL=="irlpt*", NAME="%k", GROUP="lp"
+SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp"
+KERNEL=="irlpt*", GROUP="lp"
# cpu devices
KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid"
@@ -56,46 +52,41 @@ KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
KERNEL=="microcode", NAME="cpu/microcode", MODE="0600"
# IEEE1394 devices
-KERNEL=="raw1394*", NAME="%k", GROUP="video"
-KERNEL=="dv1394*", NAME="%k", SYMLINK+="dv1394/%n", GROUP="video"
-KERNEL=="video1394*", NAME="%k", SYMLINK+="video1394/%n", GROUP="video"
+KERNEL=="raw1394*", GROUP="video"
+KERNEL=="dv1394*", SYMLINK+="dv1394/%n", GROUP="video"
+KERNEL=="video1394*", SYMLINK+="video1394/%n", GROUP="video"
-# 183 = /dev/hwrng Generic random number generator
KERNEL=="hw_random", NAME="hwrng", SYMLINK+="%k"
-# 219 /dev/modems/mwave MWave modem firmware upload
KERNEL=="mwave", NAME="modems/%k"
-# 169 /dev/specialix_rioctl Specialix RIO serial control
KERNEL=="rioctl", NAME="specialix_rioctl", SYMLINK+="%k"
-# 167 /dev/specialix_sxctl Specialix serial control
KERNEL=="sxctl", NAME="specialix_sxctl", SYMLINK+="%k"
# network
-KERNEL=="tun", NAME="net/%k", MODE="0600"
+KERNEL=="tun", NAME="net/%k", MODE="0600"
# misc devices
-KERNEL=="mem", NAME="%k", GROUP="kmem", MODE="640"
-KERNEL=="kmem", NAME="%k", GROUP="kmem", MODE="640"
-KERNEL=="port", NAME="%k", GROUP="kmem", MODE="640"
-KERNEL=="nvram", NAME="%k", GROUP="kmem", MODE="600"
-KERNEL=="null", NAME="%k", MODE="666"
-KERNEL=="zero", NAME="%k", MODE="666"
-KERNEL=="full", NAME="%k", MODE="622"
-KERNEL=="random", NAME="%k", MODE="666"
-KERNEL=="urandom", NAME="%k", MODE="644"
+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=="sonypi", MODE="0666"
KERNEL=="agpgart", MODE="0600", GROUP="video"
-KERNEL=="djs*", NAME="%k", MODE="644"
-KERNEL=="sgi_*", NAME="%k", MODE="666"
-KERNEL=="rrom*", NAME="%k", MODE="400"
-KERNEL=="rflash*", NAME="%k", MODE="400"
-KERNEL=="usbscanner*", NAME="%k", MODE="644"
-KERNEL=="3270/ttycons*", NAME="%k", MODE="600"
-KERNEL=="3270/tub*", NAME="%k", MODE="666"
-KERNEL=="3270/tubcons*", NAME="%k", MODE="600"
-KERNEL=="ica", NAME="%k", MODE="666"
-KERNEL=="z90crypt", NAME="%k", MODE="666"
-KERNEL=="mmtimer", NAME="%k", MODE="644"
+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=="auer[0-9]*" NAME="usb/%k"
# packet writing interface
@@ -113,38 +104,28 @@ SUBSYSTEM=="block", GROUP="disk", MODE="0640"
# sd: 0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
# sr: 4 TYPE_WORM, 5 TYPE_ROM
# st/osst: 1 TYPE_TAPE
-ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="0|7|14", RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
-ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
+SUBSYSTEM=="scsi", ACTION=="add", SYSFS{type}=="0|7|14", RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
+SUBSYSTEM=="scsi", ACTION=="add", SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="1", RUN+="/sbin/modprobe st"
SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{type}=="[45]", RUN+="/sbin/modprobe sr_mod"
SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
-
-# device mapper
-KERNEL=="device-mapper", NAME="%k", SYMLINK+="mapper/control"
+KERNEL=="hd*", BUS=="ide", SYSFS{media}=="floppy", OPTIONS+="all_partitions"
+SUBSYTEM=="ide", ACTION=="add", SYSFS{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
# misc storage devices (non-block)
-KERNEL=="sg*", NAME="%k", GROUP="disk", MODE="640"
-KERNEL=="st*", NAME="%k", GROUP="disk"
-KERNEL=="nst*", NAME="%k", GROUP="disk"
-KERNEL=="initrd", NAME="%k", GROUP="disk"
-KERNEL=="qft*", NAME="%k", GROUP="disk"
-KERNEL=="nqft*", NAME="%k", GROUP="disk"
-KERNEL=="zqft*", NAME="%k", GROUP="disk"
-KERNEL=="nzqft*", NAME="%k", GROUP="disk"
-KERNEL=="rawqft*", NAME="%k", GROUP="disk"
-KERNEL=="nrawqft*", NAME="%k", GROUP="disk"
-KERNEL=="pf*", NAME="%k", GROUP="disk"
-KERNEL=="sch*", NAME="%k", GROUP="disk"
-KERNEL=="pt*", NAME="%k", GROUP="disk"
-KERNEL=="npt*", NAME="%k", GROUP="disk"
-KERNEL=="pg*", NAME="%k", GROUP="disk"
-KERNEL=="evms/block_device*", NAME="%k", GROUP="disk"
-KERNEL=="rawctl*", NAME="raw/%k", GROUP="disk"
-KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
-KERNEL=="osst*", NAME="%k", GROUP="disk"
-KERNEL=="nosst*", NAME="%k", GROUP="disk"
+KERNEL=="sg*", GROUP="disk", MODE="640"
+KERNEL=="st*|nst*", GROUP="disk"
+KERNEL=="qft*|nqft*|zqft*|nzqft*|rawqft*|nrawqft", GROUP="disk"
+KERNEL=="ht*|nht*", GROUP="disk"
+KERNEL=="pf*", GROUP="disk"
+KERNEL=="sch*", GROUP="disk"
+KERNEL=="pt*|npt*", GROUP="disk"
+KERNEL=="pg*", GROUP="disk"
+KERNEL=="evms/block_device*", GROUP="disk"
+KERNEL=="rawctl*|raw[0-9]*", NAME="raw/%k", GROUP="disk"
+KERNEL=="osst*|nosst*", NAME="%k", GROUP="disk"
KERNEL=="iseries/vt*", NAME="%k", GROUP="disk"
KERNEL=="iseries/nvt*", NAME="%k", GROUP="disk"
KERNEL=="iseries/ibmsis*", NAME="%k", GROUP="disk"
diff --git a/etc/udev/suse/60-persistent-storage.rules b/etc/udev/suse/60-persistent-storage.rules
index 5a63a4fa70..f24b999a4a 100644
--- a/etc/udev/suse/60-persistent-storage.rules
+++ b/etc/udev/suse/60-persistent-storage.rules
@@ -37,7 +37,7 @@ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%
# by-label/by-uuid (filesystem properties)
KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end"
IMPORT{program}="vol_id --export $tempnode"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+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", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
# BIOS Enhanced Disk Device
diff --git a/etc/udev/suse/64-device-mapper.rules b/etc/udev/suse/64-device-mapper.rules
index 3837d3f2c7..c4b7032153 100644
--- a/etc/udev/suse/64-device-mapper.rules
+++ b/etc/udev/suse/64-device-mapper.rules
@@ -1,15 +1,17 @@
# device mapper links hook into "online" event, when the dm table
# is available, while some table types must be ignored
-KERNEL=="dm-*", ACTION=="add|online", GOTO="device_mapper_do"
+KERNEL=="device-mapper", SYMLINK+="mapper/control"
+
+KERNEL=="dm-*", ACTION=="add|change", GOTO="device_mapper_do"
GOTO="device_mapper_end"
LABEL="device_mapper_do"
PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end"
-IMPORT{program}="/sbin/vol_id --export $tempnode"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+IMPORT{program}="vol_id --export $tempnode"
+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", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
LABEL="device_mapper_end"
diff --git a/etc/udev/suse/80-sysconfig.rules b/etc/udev/suse/80-sysconfig.rules
deleted file mode 100644
index 8efb7901a0..0000000000
--- a/etc/udev/suse/80-sysconfig.rules
+++ /dev/null
@@ -1,17 +0,0 @@
-ENV{SYSCONFIG}=="no|off|0", GOTO="sysconfig_end"
-
-# SUSE system integration
-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{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"
-SUBSYSTEM=="ccwgroup", ACTION=="add", RUN+="/sbin/hwup ccwgroup-devpath-%p -o hotplug"
-SUBSYSTEM=="pnp", ACTION=="add", RUN+="/sbin/hwup pnp-devpath-%p -o hotplug"
-SUBSYSTEM=="ide", ACTION=="add", RUN+="/sbin/hwup ide-devpath-%p -o hotplug"
-SUBSYSTEM=="input", KERNEL=="input[0-9]*", ACTION=="add", RUN+="/sbin/hwup input-devpath-%p -o hotplug"
-
-LABEL="sysconfig_end"