diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-03-16 17:26:47 +0900 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2013-03-18 18:28:59 +0100 |
| commit | f4fbb8be14051c0ea920cebcb011c965d95a7b86 (patch) | |
| tree | f1e86765f6b01138c6dcb81e347aa75b9a5ced87 /rules | |
| parent | 0cf2d0d023389957f57175c9cfb6aba56c0df343 (diff) | |
| download | systemd-f4fbb8be14051c0ea920cebcb011c965d95a7b86.tar.gz systemd-f4fbb8be14051c0ea920cebcb011c965d95a7b86.tar.bz2 systemd-f4fbb8be14051c0ea920cebcb011c965d95a7b86.zip | |
udev: builtin - use RUN rather than IMPORT for loading modules
The 'kmod' builtin, like the 'firmware' and 'uaccess' builtins, does not set
any variables, so don't use IMPORT.
Notice that this changes the behaviour slightly: the processing of subsequent
rules for the event that loads a module will no longer wait for the module
loading to finish. This is not expected to cause any problems, but we should
keep an eye on it.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/80-drivers.rules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules index a0615cc3b2..50523e4333 100644 --- a/rules/80-drivers.rules +++ b/rules/80-drivers.rules @@ -2,12 +2,12 @@ ACTION=="remove", GOTO="drivers_end" -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" +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{builtin}="kmod load $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}="kmod load tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}="kmod load tifm_ms" +SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block" +SUBSYSTEM=="i2o", RUN{builtin}="kmod load i2o_block" SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev" -KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl" +KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN{builtin}="kmod load sm_ftl" LABEL="drivers_end" |