update SUSE rules

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

7 files changed, 27 insertions, 24 deletions

diff --git a/etc/udev/suse/05-udev-early.rules b/etc/udev/suse/05-udev-early.rules
new file mode 100644
index 0000000000..ce159d56d3
--- /dev/null
+++ b/etc/udev/suse/05-udev-early.rules
@@ -0,0 +1,7 @@
+# sysfs is populated after the event is sent
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+
+# ignore these events until someone needs them
+SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
+SUBSYSTEM=="module",		OPTIONS="ignore_device"
+
diff --git a/etc/udev/suse/10-wait-for-sysfs.rules b/etc/udev/suse/10-wait-for-sysfs.rules
deleted file mode 100644
index 80c1781530..0000000000
--- a/etc/udev/suse/10-wait-for-sysfs.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
diff --git a/etc/udev/suse/40-bluetooth.rules b/etc/udev/suse/40-bluetooth.rules
index 7405d15b21..b6d706cabf 100644
--- a/etc/udev/suse/40-bluetooth.rules
+++ b/etc/udev/suse/40-bluetooth.rules
@@ -1,5 +1,5 @@
 # bluetooth subsystem
-SUBSYSTEM=="bluetooth", RUN+="/sbin/udev.bluetooth.sh"
+SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
 
 # uncomment this if you have configured an automatic rfcomm-bind in
 # /etc/bluetooth/rfcomm.conf
diff --git a/etc/udev/suse/50-udev.rules b/etc/udev/suse/50-udev-default.rules
index 51561ffd0f..09f197da23 100644
--- a/etc/udev/suse/50-udev.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -1,7 +1,3 @@
-# ignore these events until someone needs them
-SUBSYSTEM=="drivers",		OPTIONS="last_rule"
-SUBSYSTEM=="module",		OPTIONS="last_rule"
-
 # 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"
@@ -39,10 +35,6 @@ 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"
 
-# Kino jogshuttle support
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="b33/10/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
-SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="5f3/240/*", RUN+="/usr/bin/killall --quiet -USR2 kino"
-
 # input devices
 KERNEL=="mice",			NAME="input/%k", MODE="0640"
 KERNEL=="mouse*",		NAME="input/%k", MODE="0640"
@@ -51,7 +43,7 @@ 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=="input[0-9]*", ACTION=="add", RUN+="/lib/udev/input.sh"
+KERNEL=="input[0-9]*", ACTION=="add", RUN+="input.sh"
 
 # printer
 SUBSYSTEM=="usb",		KERNEL=="lp*", NAME="usb/%k", SYMLINK+="usb%k", GROUP="lp"
@@ -77,6 +69,9 @@ 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"
+
 # misc devices
 KERNEL=="mem",			NAME="%k", GROUP="kmem", MODE="640"
 KERNEL=="kmem",			NAME="%k", GROUP="kmem", MODE="640"
@@ -103,13 +98,14 @@ KERNEL=="z90crypt",		NAME="%k", MODE="666"
 KERNEL=="mmtimer",		NAME="%k", MODE="444"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 
+# packet writing interface
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 
 # fix floppy devices
-KERNEL=="nvram", ACTION=="add", RUN+="/lib/udev/load_floppy_module.sh"
-KERNEL=="fd*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="/lib/udev/create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
-KERNEL=="fd*", ACTION=="remove", RUN+="/lib/udev/remove_floppy_devices.sh %k"
+KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
+KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/rm -f $root/%k*"
 
 # block devices
 SUBSYSTEM=="block", GROUP="disk", MODE="0640"
@@ -125,14 +121,14 @@ SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="1", RUN+="/sbin/mo
 SUBSYSTEM=="scsi_device", ACTION=="add", SYSFS{device/type}=="[45]", RUN+="/sbin/modprobe sr_mod"
 SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
 
-# IDE modules
-SUBSYSTEM=="ide", ACTION=="add", RUN+="/lib/udev/ide.sh"
+# load IDE modules
+SUBSYSTEM=="ide", ACTION=="add", RUN+="ide.sh"
 
 # device mapper
-KERNEL=="device-mapper", ACTION=="add", NAME="%k", SYMLINK+="mapper/control"
+KERNEL=="device-mapper", NAME="%k", SYMLINK+="mapper/control"
 
 # check fstab and possibly mount
-SUBSYSTEM=="block", KERNEL=="sd*[0-9]|hd*[0-9]", ACTION=="add", RUN+="/lib/udev/mount.sh"
+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"
@@ -161,6 +157,6 @@ KERNEL=="iseries/ibmsis*",	NAME="%k", GROUP="disk"
 # libusb device access
 SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
 
-# firmware loader
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware.sh"
+# kernel firmware loader
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
 
diff --git a/etc/udev/suse/60-persistent.rules b/etc/udev/suse/60-persistent-disk.rules
index 0d24a29338..3515bb189d 100644
--- a/etc/udev/suse/60-persistent.rules
+++ b/etc/udev/suse/60-persistent-disk.rules
@@ -43,6 +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"
 
-KERNEL=="dm-[0-9]*", ACTION=="add", PROGRAM="/sbin/dmsetup info -c --noheadings -o name -j %M -m %m", SYMLINK="disk/by-name/%c"
+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/80-sysconfig.rules b/etc/udev/suse/80-sysconfig.rules
index d33d975b36..7073813c61 100644
--- a/etc/udev/suse/80-sysconfig.rules
+++ b/etc/udev/suse/80-sysconfig.rules
@@ -1,7 +1,6 @@
 ENV{SYSCONFIG}=="no|off|0", GOTO="sysconfig_end"
 
-# network devices
-KERNEL=="tun", NAME="net/%k", MODE="0600"
+# SUSE network device handling
 SUBSYSTEM=="net", ACTION=="add", RUN+="/sbin/ifup $env{INTERFACE} -o hotplug"
 SUBSYSTEM=="net", ACTION=="remove", RUN+="/sbin/ifdown %k -o hotplug"
 
@@ -16,5 +15,7 @@ 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"
diff --git a/etc/udev/suse/95-debug.rules b/etc/udev/suse/95-udev-late.rules
index 280287c1a7..81331ad6b7 100644
--- a/etc/udev/suse/95-debug.rules
+++ b/etc/udev/suse/95-udev-late.rules
@@ -1,5 +1,5 @@
 # debug events to /events, but not on default udev_log="err"
-ENV{UDEV_LOG}=="[4-9]", RUN+="/lib/udev/eventrecorder.sh"
+ENV{UDEV_LOG}=="[4-9]", RUN+="eventrecorder.sh"
 
 # event to be catched by udevmonitor
 RUN+="socket:/org/kernel/udev/monitor"