update Debian rules

[elogind.git] / etc / udev / debian / hotplug.rules

diff --git a/etc/udev/debian/hotplug.rules b/etc/udev/debian/hotplug.rules
index eae68864c963ebf80e37509010300bd4709d85db..0b2fc57126efb730064d62c54a2e05425780a06d 100644 (file)
--- a/etc/udev/debian/hotplug.rules
+++ b/etc/udev/debian/hotplug.rules
@@ -1,19 +1,22 @@
 ACTION!="add", GOTO="hotplug_not_add_event"
 
 # check if the device has already been claimed by a driver
-ENV{PHYSDEVDRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded"
+ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded"
+
+# this driver is broken and should not be loaded automatically (see #398962)
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_driver_loaded"
 
 # load the drivers
-ENV{MODALIAS}=="?*",   RUN+="/sbin/modprobe $env{MODALIAS}"
+ENV{MODALIAS}=="?*",   RUN+="/sbin/modprobe --use-blacklist $env{MODALIAS}"
 SUBSYSTEM=="ide",      ENV{MODALIAS}!="?*",    RUN+="ide.agent"
 
-SUBSYSTEM=="pnp",      ENV{MODALIAS}!="?*",    RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+SUBSYSTEM=="pnp",      ENV{MODALIAS}!="?*",    RUN+="/bin/sh -c 'while read id; do /sbin/modprobe --use-blacklist pnp:d$$id; done < /sys$devpath/id'"
 
 SUBSYSTEM=="pcmcia_socket",                    RUN+="/sbin/modprobe pcmcia"
 
 # rules for subsystems which lack proper hotplug support
-SUBSYSTEM=="i2o",                              RUN+="/sbin/modprobe i2o-block"
-#SUBSYSTEM=="mmc",                             RUN+="/sbin/modprobe mmc-block"
+SUBSYSTEM=="i2o",                              RUN+="/sbin/modprobe i2o_block"
+SUBSYSTEM=="mmc",                              RUN+="/sbin/modprobe mmc_block"
 
 SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
 SUBSYSTEM=="scsi_device", ATTRS{type}=="1",    RUN+="/sbin/modprobe osst", \
@@ -23,9 +26,10 @@ SUBSYSTEM=="scsi_device", ATTRS{type}=="1",  RUN+="/sbin/modprobe st", \
 SUBSYSTEM=="scsi_device", ATTRS{type}=="1",    RUN+="/sbin/modprobe st", \
        ATTRS{vendor}!="Onstream"
 SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", RUN+="/sbin/modprobe sr_mod"
+SUBSYSTEM=="scsi_device", ATTRS{type}=="8",    RUN+="/sbin/modprobe ch"
 SUBSYSTEM=="scsi_device", ATTRS{type}=="[235689]", RUN+="/sbin/modprobe sg"
 
-SUBSYSTEM=="ide", ATTRS{media}=="tape",                RUN+="/sbin/modprobe ide-scsi"
+SUBSYSTEM=="ide", ATTR{media}=="tape",         RUN+="/sbin/modprobe ide-scsi"
 
 # From here on follows the hotplug agents which do not load modules
 LABEL="hotplug_driver_loaded"
@@ -34,11 +38,11 @@ LABEL="hotplug_driver_loaded"
 #SUBSYSTEM=="scsi_device", ATTRS{idVendor}=="...", \
 #      RUN+="scsi-re-add"
 
-SUBSYSTEM=="firmware",         RUN+="firmware.agent"
+SUBSYSTEM=="firmware",                         RUN+="firmware.agent"
 
 LABEL="hotplug_not_add_event"
 
-SUBSYSTEM=="net",              RUN+="/bin/sh -c '/lib/udev/net.agent &'"
+SUBSYSTEM=="net",                              RUN+="net.agent"
 
 # Log every event to /dev/hotplug.log (for debugging).
 #RUN+="logger.agent"