140def848
Denys Vlasenko
2009-05-26
Subject
modprobe: fix modprobe -r. closes bug 315
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/modprobe.c+4 -2
| @@ -114,7 +114,9 @@ static void add_probe(const char *name) | |
| struct module_entry *m; | |
| m = get_or_add_modentry(name); | |
| - | if (m->flags & MODULE_FLAG_LOADED) { |
| + | if (!(option_mask32 & MODPROBE_OPT_REMOVE) |
| + | && (m->flags & MODULE_FLAG_LOADED) |
| + | ) { |
| DBG("skipping %s, it is already loaded", name); | |
| return; | |
| } | |
| @@ -350,7 +352,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |
| config_close(parser); | |
| } | |
| - | if (opt & MODPROBE_OPT_INSERT_ALL) { |
| + | if (opt & (MODPROBE_OPT_INSERT_ALL | MODPROBE_OPT_REMOVE)) { |
| /* Each argument is a module name */ | |
| do { | |
| DBG("adding module %s", *argv); | |