summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco d'Itri <md@Linux.IT>2006-05-01 03:32:30 +0200
committerKay Sievers <kay.sievers@suse.de>2006-05-01 03:32:30 +0200
commit5263fb3464fdb43b1ca0eb6e7b71eb4ff91c6a17 (patch)
tree839b41488acd7bbe1f027a04c49625891a27df2a
parentb1c4f377c4989e0d881778b5a61f0d08b05c0a24 (diff)
update Debian rules
-rw-r--r--etc/udev/debian/permissions.rules2
-rw-r--r--etc/udev/debian/persistent-input.rules4
-rw-r--r--etc/udev/debian/persistent.rules3
3 files changed, 5 insertions, 4 deletions
diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules
index b010353a22..8da35c3090 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 95021b1646..339a365048 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 7fc86246f3..9f1887ddea 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_*"