summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-11-19 15:09:40 -0500
committerRichard Yao <ryao@cs.stonybrook.edu>2012-11-23 01:55:23 -0500
commit135d61df6f66d0c0e67aec62f76ee7f2a409a3ce (patch)
tree4106807f267d3116b81c1508868f36d2f51f7443 /rules
parent9b996818cb6eacaaecaaa9bae8d0377fa1fdb803 (diff)
Reintroduce blkid-kmod
This opens the door to using disabling the use of kmod from autotools. Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'rules')
-rw-r--r--rules/75-probe_mtd.rules2
-rw-r--r--rules/80-drivers.rules12
2 files changed, 7 insertions, 7 deletions
diff --git a/rules/75-probe_mtd.rules b/rules/75-probe_mtd.rules
index a17c8252ff..c0e0839785 100644
--- a/rules/75-probe_mtd.rules
+++ b/rules/75-probe_mtd.rules
@@ -3,6 +3,6 @@
ACTION!="add", GOTO="mtd_probe_end"
KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $devnode"
-KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="@sbindir@/modprobe -bv sm_ftl"
+KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl"
LABEL="mtd_probe_end"
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
index 04e30f5b04..692510c912 100644
--- a/rules/80-drivers.rules
+++ b/rules/80-drivers.rules
@@ -2,11 +2,11 @@
ACTION=="remove", GOTO="drivers_end"
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="@sbindir@/modprobe -bv $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="@sbindir@/modprobe -bv tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="@sbindir@/modprobe -bv tifm_ms"
-SUBSYSTEM=="memstick", RUN+="@sbindir@/modprobe -bv --all ms_block mspro_block"
-SUBSYSTEM=="i2o", RUN+="@sbindir@/modprobe -bv i2o_block"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="@sbindir@/modprobe -bv ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", IMPORT{builtin}="kmod load tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", IMPORT{builtin}="kmod load tifm_ms"
+SUBSYSTEM=="memstick", IMPORT{builtin}="kmod load ms_block mspro_block"
+SUBSYSTEM=="i2o", IMPORT{builtin}="kmod load i2o_block"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev"
LABEL="drivers_end"