SOURCES: udev-modprobe.rules - cleaned up, updates from other distros

[freetz]

Author: freetz                       Date: Sun Mar 12 15:56:33 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- cleaned up, updates from other distros

---- Files affected:
SOURCES:
   udev-modprobe.rules (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/udev-modprobe.rules
diff -u SOURCES/udev-modprobe.rules:1.11 SOURCES/udev-modprobe.rules:1.12
--- SOURCES/udev-modprobe.rules:1.11	Sat Jan  7 14:09:48 2006
+++ SOURCES/udev-modprobe.rules	Sun Mar 12 16:56:28 2006
@@ -1,76 +1,44 @@
-# workarounds needed to synchronize with sysfs
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", \
-    WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
-
-# allow pci cold plug for usb controllers only
-# alias pci:v*d*sv*sd*bc0Csc03i10* ohci-hcd
-# alias pci:v*d*sv*sd*bc0Csc03i20* ehci-hcd
-# alias pci:v*d*sv*sd*bc0Csc03i00* uhci-hcd
-ACTION=="add", SUBSYSTEM=="pci", ENV{UDEV_START}=="1", MODALIAS=="*", \
-        SYSFS{class}="0x0c0300|0x0c0310|0x0c0320", \
-        RUN+="/sbin/modprobe $modalias"
-
-# modprobe pci devices on hot plug
-ACTION=="add", SUBSYSTEM=="pci", ENV{UDEV_START}!="1", MODALIAS=="*", \
-        RUN+="/sbin/modprobe $modalias"
-
-# usbhid should be loaded before usbmouse, or else some Microsoft mice
-# move vertically only
-ACTION=="add", MODALIAS="usb:v*p*d*dc*dsc*dp*ic03isc01ip02*", \
-	RUN+="/sbin/modprobe usbhid"
-
-# modprobe on hot plug (and cold plug, which is processed by udevstart)
-ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
-        RUN+="/sbin/modprobe $modalias"
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
-        RUN+="/sbin/modprobe $modalias"
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
-        RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
-ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \
-        RUN+="/sbin/modprobe $modalias"
+ACTION!="add", GOTO="hotplug_not_add_event"
 
-# disks & magneto-optical disk:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
-	RUN+="/sbin/modprobe sd_mod"
+# check a driver is already loaded
+ENV{PHYSDEVDRIVER}=="?*", GOTO="hotplug_driver_loaded"
+
+# load the drivers
+ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# pcmcia
+SUBSYSTEM=="pcmcia_socket", RUN+="/sbin/modprobe pcmcia"
 
-# enclosure:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
+# pnp
+#SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", \
+#	RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+
+# disks & magneto-optical disk:
+SUBSYSTEM=="scsi", SYSFS{type}=="0|7|14", \
 	RUN+="/sbin/modprobe sd_mod"
 
 # WORM & ROM:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
+SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
 	RUN+="/sbin/modprobe sr_mod"
 
 # Tape:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
+SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
         SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
 
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
+SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
 	SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
 
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream", \
+SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream", \
         RUN+="/sbin/modprobe st"
 
 # printer, scanner (hp & all), changer & comm :
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
+SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
         RUN+="/sbin/modprobe sg"
 
-# helpers	      
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="*", \
-	RUN+="/lib/udev/udev_net_helper"
-	
-ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="*", \
-	RUN+="/lib/udev/udev_net_helper"
-
-ACTION=="add", SUBSYSTEM=="input", \
-	RUN+="/lib/udev/udev_input_helper"
-
-ACTION=="add", SUBSYSTEM=="ieee1394", \
-	RUN+="/lib/udev/udev_ieee1394_helper"
-	
-ACTION=="remove", SUBSYSTEM=="ieee1394", \
-	RUN+="/lib/udev/udev_ieee1394_helper"
+LABEL="hotplug_driver_loaded"
+
+SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+LABEL="hotplug_not_add_event"
 
-ACTION=="add", SUBSYSTEM=="firmware", \
-	RUN+="/lib/udev/firmware_helper"
+SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="/lib/udev/udev_net_helper"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/udev-modprobe.rules?r1=1.11&r2=1.12&f=u