rpms/udev/devel udev-rules.patch,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3208

Modified Files:
	udev-rules.patch 
Log Message:
need ENV{MODALIAS} as well


udev-rules.patch:
 05-udev-early.rules  |    9 ++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 +++
 udev.rules           |  168 ++++++++++++++++++++++++++++-----------------------
 4 files changed, 114 insertions(+), 77 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- udev-rules.patch	5 Mar 2006 05:42:06 -0000	1.9
+++ udev-rules.patch	5 Mar 2006 05:59:32 -0000	1.10
@@ -242,7 +242,7 @@
 +	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
 +	NAME="%c", MODE="0644"
  
-+ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
  
 -# Perhaps this should just be for all subsystems?
 -
@@ -252,7 +252,8 @@
 -	RUN+="/sbin/modprobe $modalias"
 -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
 -	RUN+="/sbin/modprobe $modalias"
- ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="*", \
          RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
  
 -ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \