From 47b3e9478c48dbe5f428bd6fc074eac78f2765c3 Mon Sep 17 00:00:00 2001
From: Marco d'Itri <md@Linux.IT>
Date: Mon, 29 May 2006 21:00:32 +0200
Subject: [PATCH 1/1] update Debian rules

---
 etc/udev/debian/hotplug.rules          | 5 -----
 etc/udev/debian/persistent-input.rules | 8 ++++++++
 etc/udev/debian/persistent.rules       | 5 +----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/etc/udev/debian/hotplug.rules b/etc/udev/debian/hotplug.rules
index d592c5e9d..426424de5 100644
--- a/etc/udev/debian/hotplug.rules
+++ b/etc/udev/debian/hotplug.rules
@@ -3,14 +3,9 @@ ACTION!="add", GOTO="hotplug_not_add_event"
 # check if the device has already been claimed by a driver
 ENV{PHYSDEVDRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded"
 
-# workarounds for kernels which lack $MODALIAS support
-SUBSYSTEM=="ieee1394",	ENV{MODALIAS}!="?*", IMPORT{program}="modalias_ieee1394"
-SUBSYSTEM=="serio",	ENV{MODALIAS}!="?*", IMPORT{program}="modalias_serio"
-
 # load the drivers
 ENV{MODALIAS}=="?*",	RUN+="/sbin/modprobe $env{MODALIAS}"
 SUBSYSTEM=="ide",	ENV{MODALIAS}!="?*",	RUN+="ide.agent"
-SUBSYSTEM=="vio",	ENV{MODALIAS}!="?*",	RUN+="vio.agent"
 
 SUBSYSTEM=="pnp",	ENV{MODALIAS}!="?*",	RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
 
diff --git a/etc/udev/debian/persistent-input.rules b/etc/udev/debian/persistent-input.rules
index 339a36504..293971266 100644
--- a/etc/udev/debian/persistent-input.rules
+++ b/etc/udev/debian/persistent-input.rules
@@ -10,6 +10,14 @@ BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="01", \
 BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="02", \
 					ENV{ID_CLASS}="mouse"
 
+# other devices
+DRIVER=="pcspkr",			ENV{ID_CLASS}="spkr"
+DRIVER=="atkbd",			ENV{ID_CLASS}="kbd"
+DRIVER=="psmouse",			ENV{ID_CLASS}="mouse"
+SYSFS{name}=="*dvb*|*DVB*|* IR *",	ENV{ID_CLASS}="ir"
+
+ENV{ID_SERIAL}=="",			ENV{ID_SERIAL}="noserial"
+
 # by-id links, generic and for the event devices
 KERNEL=="mouse*", \
 	ENV{ID_BUS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", \
diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 9f1887dde..349817d79 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -5,7 +5,7 @@ SUBSYSTEM!="block",			GOTO="no_volume_id"
 ACTION!="add",				GOTO="no_volume_id"
 
 # and we can safely ignore these kinds of devices
-KERNEL=="ram*|loop*|fd*|nbd*",		GOTO="no_volume_id"
+KERNEL=="ram*|loop*|fd*|nbd*|dm-*",	GOTO="no_volume_id"
 
 # skip removable ide devices, because open(2) on them causes an events loop
 KERNEL=="hd*[!0-9]",   SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", \
@@ -69,9 +69,6 @@ ENV{ID_FS_UUID}=="?*",			ENV{ID_FS_USAGE}=="filesystem|other", \
 ENV{ID_FS_LABEL_SAFE}=="?*",		ENV{ID_FS_USAGE}=="filesystem|other", \
 	SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
-#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", \
-#	SYMLINK+="disk/by-name/%c"
-
 # end of processing
 LABEL="no_volume_id"
 
-- 
2.30.2