install: also install post weak dependencies of kernel modules

master
Lukas Nykryn 2020-07-02 09:08:03 +02:00 committed by Harald Hoyer
parent 5c3d0a9647
commit 6dafdda4a6
1 changed files with 13 additions and 5 deletions

View File

@ -1482,9 +1482,13 @@ static int install_dependent_modules(struct kmod_list *modlist)
ret = install_dependent_modules(modlist);
if (ret == 0) {
ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
if (ret == 0)
ret = install_dependent_modules(modpre);
}
if (ret == 0) {
int r;
ret = install_dependent_modules(modpre);
r = install_dependent_modules(modpost);
ret = ret ? : r;
}
}
} else {
log_error("dracut_install '%s' '%s' ERROR", path, &path[kerneldirlen]);
}
@ -1545,8 +1549,12 @@ static int install_module(struct kmod_module *mod)

if (ret == 0) {
ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
if (ret == 0)
ret = install_dependent_modules(modpre);
if (ret == 0) {
int r;
ret = install_dependent_modules(modpre);
r = install_dependent_modules(modpost);
ret = ret ? : r;
}
}

return ret;