X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=etc%2Fudev%2Fdebian%2Fhotplug.rules;h=f4c99ec8eb73cc43a28229448b272233ee01519e;hp=84f8c32156f9b9d0e100a864c6a523e15cccac7c;hb=6acd81c8981a5f0ea80e3cdef2a10e5d595bbae3;hpb=de34dc2b06f941a7d3aa12e4cdc62b48677a0c3b

diff --git a/etc/udev/debian/hotplug.rules b/etc/udev/debian/hotplug.rules
index 84f8c3215..f4c99ec8e 100644
--- a/etc/udev/debian/hotplug.rules
+++ b/etc/udev/debian/hotplug.rules
@@ -1,18 +1,23 @@
 ACTION!="add", GOTO="hotplug_not_add_event"
 
 # check if the device has already been claimed by a driver
-PROGRAM="/bin/sh -c 'test -e /sys$devpath/driver'", \
-					GOTO="hotplug_driver_loaded"
+ENV{PHYSDEVDRIVER}=="?*", GOTO="hotplug_driver_loaded"
 
 # workarounds for kernels which lack $MODALIAS support
-SUBSYSTEM=="input", BUS=="serio", ENV{MODALIAS}!="?*", \
-	IMPORT{program}="/lib/hotplug/modalias_serio"
-SUBSYSTEM=="ieee1394", ENV{MODALIAS}!="?*", \
-	IMPORT{program}="/lib/hotplug/modalias_ieee1394"
+SUBSYSTEM=="ieee1394",	ENV{MODALIAS}!="?*", \
+	IMPORT{program}="/lib/udev/modalias_ieee1394"
+SUBSYSTEM=="serio",	ENV{MODALIAS}!="?*", \
+	IMPORT{program}="/lib/udev/modalias_serio"
 
 # load the drivers
-ENV{MODALIAS}=="?*",			RUN+="/sbin/modprobe $modalias"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*",	RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+ENV{MODALIAS}=="?*",	RUN+="/sbin/modprobe $env{MODALIAS}"
+SUBSYSTEM=="ide",	ENV{MODALIAS}!="?*",	RUN+="/lib/udev/ide.agent"
+#SUBSYSTEM=="input",	ENV{MODALIAS}!="?*",	RUN+="/lib/udev/input.agent"
+SUBSYSTEM=="vio",	ENV{MODALIAS}!="?*",	RUN+="/lib/udev/vio.agent"
+
+SUBSYSTEM=="pnp",	ENV{MODALIAS}!="?*",	RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+
+SUBSYSTEM=="pcmcia_socket",			RUN+="/sbin/modprobe pcmcia"
 
 SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
 SUBSYSTEM=="scsi_device", SYSFS{type}=="1",	RUN+="/sbin/modprobe osst", \
@@ -24,23 +29,19 @@ SUBSYSTEM=="scsi_device", SYSFS{type}=="1",	RUN+="/sbin/modprobe st", \
 SUBSYSTEM=="scsi_device", SYSFS{type}=="[345]",	RUN+="/sbin/modprobe sr_mod"
 SUBSYSTEM=="scsi_device", SYSFS{type}=="[235689]", RUN+="/sbin/modprobe sg"
 
-SUBSYSTEM=="input_device", ENV{ABS}=="?*",	RUN+="/sbin/modprobe joydev"
-
-SUBSYSTEM=="ide",				RUN+="/lib/hotplug/ide.agent"
-
 # From here on follows the hotplug agents which do not load modules
 LABEL="hotplug_driver_loaded"
 
 # FIXME: does a sane default exist?
 #SUBSYSTEM=="scsi_device", SYSFS{idVendor}=="...", \
-#	RUN+="/lib/hotplug/scsi-re-add"
+#	RUN+="/lib/udev/scsi-re-add"
 
-SUBSYSTEM=="firmware",			RUN+="/lib/hotplug/firmware.agent"
+SUBSYSTEM=="firmware",		RUN+="/lib/udev/firmware.agent"
 
 LABEL="hotplug_not_add_event"
 
-SUBSYSTEM=="net",			RUN+="/lib/hotplug/net.agent"
+SUBSYSTEM=="net",		RUN+="/bin/sh -c '/lib/udev/net.agent &'"
 
-# for debugging
-#RUN+="/lib/hotplug/logger.agent"
+# Log every event to /dev/hotplug.log (for debugging).
+#RUN+="/lib/udev/logger.agent"