From 54b813ba0d750900a961dd2d5c586dd814234218 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam@gentoo.org>
Date: Fri, 27 Apr 2007 11:42:34 +0200
Subject: [PATCH] rules: Gentoo update

---
 etc/udev/gentoo/50-udev.rules          |  2 +-
 etc/udev/gentoo/64-device-mapper.rules | 10 +++++-----
 etc/udev/gentoo/95-udev-late.rules     |  3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
index 28875536a..57f2387a5 100644
--- 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 1100c1b7b..d2639af5d 100644
--- 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 5d7a6a8a4..40ada28b1 100644
--- 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"
 
-- 
2.30.2