rules: Gentoo update

diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index 28875536a0985a333f5ba882bd9680329480c639..57f2387a5c47ad65d1a4055521d90e88b1b3ef90 100644 (file)
--- a/etc/udev/gentoo/50-udev.rules
+++ b/etc/udev/gentoo/50-udev.rules
@@ -170,7 +170,7 @@ KERNEL=="hiddev*",          NAME="usb/%k"
 KERNEL=="auer*",               NAME="usb/%k"
 KERNEL=="legousbtower*",       NAME="usb/%k", GROUP="usb"
 KERNEL=="dabusb*",             NAME="usb/%k"
-BUS=="usb", KERNEL=="lp[0-9]*",        NAME="usb/%k", GROUP="lp"
+KERNEL=="lp[0-9]*",    SUBSYSTEM=="usb",       NAME="usb/%k", GROUP="lp"
 
 # v4l devices
 KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video"

diff --git a/etc/udev/gentoo/64-device-mapper.rules b/etc/udev/gentoo/64-device-mapper.rules
index 1100c1b7bdc21e445bbb3ac7b5743944d1d99cf6..d2639af5dd95ebe1f4099fb6f422d39ca99b5e64 100644 (file)
--- a/etc/udev/gentoo/64-device-mapper.rules
+++ b/etc/udev/gentoo/64-device-mapper.rules
@@ -3,9 +3,8 @@
 
 KERNEL=="device-mapper",       NAME="mapper/control"
 
-KERNEL=="dm-*", ACTION=="add|change", GOTO="device_mapper_do"
-GOTO="device_mapper_end"
-LABEL="device_mapper_do"
+KERNEL!="dm-*", GOTO="device_mapper_end"
+ACTION!="add|change", GOTO="device_mapper_end"
 
 # lookup device name
 # use dmsetup, until devmap_name is provided by sys-fs/device-mapper
@@ -25,7 +24,8 @@ PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
 RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end"
 
 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}", OPTIONS="link_priority=50"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}", OPTIONS="link_priority=50"
+OPTIONS="link_priority=50"
+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/gentoo/95-udev-late.rules b/etc/udev/gentoo/95-udev-late.rules
index 5d7a6a8a4e176865aa3b60f76201e08e1ca8cb2e..40ada28b14ff284e63168f172fd8c7a2600dafe5 100644 (file)
--- a/etc/udev/gentoo/95-udev-late.rules
+++ b/etc/udev/gentoo/95-udev-late.rules
@@ -13,9 +13,6 @@
 SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
 SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
 
-# debug events to /events, but not on default udev_log="err"
-ENV{UDEV_LOG}=="[4-9]", RUN+="eventrecorder.sh"
-
 # event to be catched by udevmonitor
 RUN+="socket:/org/kernel/udev/monitor"