kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

install: also install post weak dependencies of kernel modules

master
Lukas Nykryn 5 years ago committed by Harald Hoyer
parent
5c3d0a9647
commit
6dafdda4a6
1 changed files with 13 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      install/dracut-install.c

18
install/dracut-install.c
Unescape View File

@ -1482,9 +1482,13 @@ static int install_dependent_modules(struct kmod_list *modlist)
ret = install_dependent_modules(modlist); ret = install_dependent_modules(modlist);
if (ret == 0) { if (ret == 0) {
ret = kmod_module_get_softdeps(mod, &modpre, &modpost); ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
if (ret == 0) if (ret == 0) {
ret = install_dependent_modules(modpre); int r;
} ret = install_dependent_modules(modpre);
r = install_dependent_modules(modpost);
ret = ret ? : r;
}
}
} else { } else {
log_error("dracut_install '%s' '%s' ERROR", path, &path[kerneldirlen]); 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) { if (ret == 0) {
ret = kmod_module_get_softdeps(mod, &modpre, &modpost); ret = kmod_module_get_softdeps(mod, &modpre, &modpost);
if (ret == 0) if (ret == 0) {
ret = install_dependent_modules(modpre); int r;
ret = install_dependent_modules(modpre);
r = install_dependent_modules(modpost);
ret = ret ? : r;
}
} }


return ret; return ret;

Write Preview
Loading…
Cancel
Save