From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 13 Nov 2008 06:47:16 +0000 (+0100)
Subject: rules: remove pnp shell script, acpi loads these modules properly
X-Git-Tag: 174~1324
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bd20bada37d55f1a747d7bc797e18f990cb9cdfe

rules: remove pnp shell script, acpi loads these modules properly
---

diff --git a/TODO b/TODO
index 8986d1972..c06451dd6 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 
   o convert firmware.sh to C
-  o drop pnp shell script, acpi will take care of loading pnp modules
   o add DVB variables to kernel (patch merged in v4l tree), drop the
     shell script rule
   o "udevadm control" commands will only accept the --<command> syntax
diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules
index 881d7581b..ca0fa6bc4 100644
--- a/rules/rules.d/80-drivers.rules
+++ b/rules/rules.d/80-drivers.rules
@@ -3,8 +3,6 @@
 ACTION!="add", GOTO="drivers_end"
 
 DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
-SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
-  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
 SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"