From: Marco d'Itri <md@Linux.IT>
Date: Mon, 1 May 2006 01:32:30 +0000 (+0200)
Subject: update Debian rules
X-Git-Tag: 174~2270
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5263fb3464fdb43b1ca0eb6e7b71eb4ff91c6a17

update Debian rules
---

diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index b010353a2..8da35c309 100644
--- a/etc/udev/debian/permissions.rules
+++ b/etc/udev/debian/permissions.rules
@@ -5,6 +5,8 @@ DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
 SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
 # only needed for kernels < 2.6.16
 SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
 
 # default permissions for block devices
 SUBSYSTEM=="block",				GROUP="disk"
diff --git a/etc/udev/debian/persistent-input.rules b/etc/udev/debian/persistent-input.rules
index 95021b164..339a36504 100644
--- a/etc/udev/debian/persistent-input.rules
+++ b/etc/udev/debian/persistent-input.rules
@@ -5,9 +5,9 @@ KERNEL=="input[0-9]*",			GOTO="persistent_input_end"
 
 # usb devices
 BUS=="usb",				IMPORT{program}="usb_id -x"
-BUS=="usb", SYSFS{bInterfaceClass}="03", SYSFS{bInterfaceProtocol}="01", \
+BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="01", \
 					ENV{ID_CLASS}="kbd"
-BUS=="usb", SYSFS{bInterfaceClass}="03", SYSFS{bInterfaceProtocol}="02", \
+BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="02", \
 					ENV{ID_CLASS}="mouse"
 
 # by-id links, generic and for the event devices
diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules
index 7fc86246f..9f1887dde 100644
--- a/etc/udev/debian/persistent.rules
+++ b/etc/udev/debian/persistent.rules
@@ -33,8 +33,7 @@ KERNEL=="*[!0-9]", \
 	IMPORT{program}="edd_id --export $tempnode"
 
 # find the physical path of the device
-KERNEL=="*[!0-9]|sr*|st*",		ENV{ID_TYPE}=="?*", \
-	IMPORT{program}="path_id $devpath"
+KERNEL=="*[!0-9]|sr*|st*",		IMPORT{program}="path_id $devpath"
 
 # import the variables of partitions from the parent disks
 KERNEL=="*[0-9]",			IMPORT{parent}="ID_*"