From f9651fac68352c9cfa6c616ae50f711c32e7bf32 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 24 Jul 2008 17:00:15 +0000
Subject: udev: Sync the rules with the versions from a more recent udev,
 optimise the boot process slightly by skipping boring ttys earlier

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4942 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/udev/udev-124/udev.rules | 37 ++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'meta/packages/udev/udev-124/udev.rules')

diff --git a/meta/packages/udev/udev-124/udev.rules b/meta/packages/udev/udev-124/udev.rules
index 4d29acac0..443315ea5 100644
--- a/meta/packages/udev/udev-124/udev.rules
+++ b/meta/packages/udev/udev-124/udev.rules
@@ -13,33 +13,44 @@
 # %% the '%' char itself
 #
 
+# workaround for devices which do not report media changes
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
+	ENV{ID_MODEL}=="IOMEGA_ZIP*",	NAME="%k", OPTIONS+="all_partitions"
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
+	OPTIONS+="all_partitions"
+
 # SCSI devices
-BUS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
 
 # USB devices
-BUS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
-BUS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
-BUS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
-BUS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
-BUS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
-BUS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
-BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \
+	ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \
 					SYMLINK+="pilot"
 
 # usbfs-like devices
-SUBSYSTEM=="usb_device", \
-	PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+SUBSYSTEM=="usb_device",	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \
+				NAME="%c"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"
 
 # serial devices
 KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
 KERNEL=="capi[0-9]*",		NAME="capi/%n"
 
 # video devices
+KERNEL=="dvb*",			PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \
+				NAME="%c"
 KERNEL=="card[0-9]*",		NAME="dri/%k"
 
 # misc devices
 KERNEL=="hw_random",		NAME="hwrng"
 KERNEL=="tun",			NAME="net/%k"
+KERNEL=="evtchn",		NAME="xen/%k"
 
 KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
@@ -52,9 +63,8 @@ KERNEL=="microcode",		NAME="cpu/microcode"
 KERNEL=="umad*",		NAME="infiniband/%k"
 KERNEL=="issm*",		NAME="infiniband/%k"
 KERNEL=="uverbs*",		NAME="infiniband/%k"
-KERNEL=="ucm",			NAME="infiniband/%k"
-
-KERNEL=="buzzer",		NAME="misc/buzzer"
+KERNEL=="ucm*",			NAME="infiniband/%k"
+KERNEL=="rdma_ucm",		NAME="infiniband/%k"
 
 # ALSA devices
 KERNEL=="controlC[0-9]*",	NAME="snd/%k"
@@ -87,6 +97,7 @@ KERNEL=="zap[0-9]*",		NAME="zap/%n"
 SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
 SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
 SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="revalidate",	NAME="etherd/%k"
 
 # device mapper creates its own device nodes, so ignore these
 KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
-- 
cgit v1.2.3