diff options
| author | Yauheni Kaliuta <yauheni.kaliuta@redhat.com> | 2019-10-31 20:12:53 +0200 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2019-11-06 23:17:06 -0800 |
| commit | 52a0ba82e1ad180f9f91920db70a758fac49466a (patch) | |
| tree | 9a18762c35631d139622108d6f4dbb97018bc502 | |
| parent | 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 (diff) | |
| download | kmod-52a0ba82e1ad180f9f91920db70a758fac49466a.tar.gz kmod-52a0ba82e1ad180f9f91920db70a758fac49466a.tar.bz2 kmod-52a0ba82e1ad180f9f91920db70a758fac49466a.zip | |
modprobe: ignore builtin module on recursive removing
If there are built-in dependencies and any of them is built-in in
the kernel, modprobe -r fails with
modprobe: FATAL: Module module_name is builtin.
It makes sense to ignore such dependencies for the case when
removing is called for non-top level module.
Example: cifs module, it declares bunch of softdeps and the first
one fails on some kernel configs:
modprobe: FATAL: Module gcm is builtin.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
| -rw-r--r-- | tools/modprobe.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/tools/modprobe.c b/tools/modprobe.c index a9e2331..44cd15c 100644 --- a/tools/modprobe.c +++ b/tools/modprobe.c @@ -353,7 +353,8 @@ static int rmmod_do_remove_module(struct kmod_module *mod) return err; } -static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies); +static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, + bool ignore_builtin); static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) { @@ -361,7 +362,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) kmod_list_foreach_reverse(l, list) { struct kmod_module *m = kmod_module_get_module(l); - int r = rmmod_do_module(m, false); + int r = rmmod_do_module(m, false, true); kmod_module_unref(m); if (r < 0 && stop_on_errors) @@ -371,7 +372,8 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors) return 0; } -static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) +static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies, + bool ignore_builtin) { const char *modname = kmod_module_get_name(mod); struct kmod_list *pre = NULL, *post = NULL; @@ -401,8 +403,12 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies) } goto error; } else if (state == KMOD_MODULE_BUILTIN) { - LOG("Module %s is builtin.\n", modname); - err = -ENOENT; + if (ignore_builtin) { + err = 0; + } else { + LOG("Module %s is builtin.\n", modname); + err = -ENOENT; + } goto error; } } @@ -462,7 +468,7 @@ static int rmmod(struct kmod_ctx *ctx, const char *alias) kmod_list_foreach(l, list) { struct kmod_module *mod = kmod_module_get_module(l); - err = rmmod_do_module(mod, true); + err = rmmod_do_module(mod, true, false); kmod_module_unref(mod); if (err < 0) break; |