emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modutils: fix config options dependency (2)

Browse Source 
- The modprobe-small implementation of rmmod no longer chdir's to
  "/lib/modules/`uname -r`" as it was not necessary for rmmod's
  operation. (And it no longer need to die if such modules directory
  doesn't exist.)
- Configs DEFAULT_MODULES_DIR and DEFAULT_DEPMOD_FILE no longer depend
  on MODPROBE_SMALL as the latter may not enable depmod or modprobe
  that requires these configs.
- Clarify DEFAULT_DEPMOD_FILE's description regarding the ".bb" name
  suffix.

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Kang-Che Sung 2017-02-05 19:02:34 +01:00 committed by Denys Vlasenko
parent 8cc1ab3c11
commit 4ae658f077
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modutils/Config.src
View File

@ -159,7 +159,7 @@ config FEATURE_MODUTILS_SYMBOLS
config DEFAULT_MODULES_DIR config DEFAULT_MODULES_DIR
string "Default directory containing modules" string "Default directory containing modules"
default "/lib/modules" default "/lib/modules"
depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO depends on DEPMOD || MODPROBE || MODINFO
help help
Directory that contains kernel modules. Directory that contains kernel modules.
Defaults to "/lib/modules" Defaults to "/lib/modules"
@ -167,9 +167,13 @@ config DEFAULT_MODULES_DIR
config DEFAULT_DEPMOD_FILE config DEFAULT_DEPMOD_FILE
string "Default name of modules.dep" string "Default name of modules.dep"
default "modules.dep" default "modules.dep"
depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO depends on DEPMOD || MODPROBE || MODINFO
help help
Filename that contains kernel modules dependencies. Filename that contains kernel modules dependencies.
Defaults to "modules.dep" Defaults to "modules.dep".
If you configured the "simplified modutils" (MODPROBE_SMALL), a
".bb" suffix will be added after this name. Do not specify ".bb"
here unless you intend your depmod or modprobe to work on
"modules.dep.bb.bb" or such.
endmenu endmenu

6
modutils/modprobe-small.c
View File

@ -934,11 +934,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
/* Prevent ugly corner cases with no modules at all */ /* Prevent ugly corner cases with no modules at all */
modinfo = xzalloc(sizeof(modinfo[0])); modinfo = xzalloc(sizeof(modinfo[0]));
if (!is_insmod) { if (is_depmod || is_modprobe) {
/* Goto modules directory */ /* Goto modules directory */
xchdir(CONFIG_DEFAULT_MODULES_DIR); xchdir(CONFIG_DEFAULT_MODULES_DIR);
}
uname(&uts); /* never fails */ uname(&uts); /* never fails */
}
/* depmod? */ /* depmod? */
if (is_depmod) { if (is_depmod) {
@ -980,7 +980,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
getopt32(argv, "qrfsvwb"); getopt32(argv, "qrfsvwb");
argv += optind; argv += optind;
if (!is_insmod) { if (is_modprobe) {
/* Goto $VERSION directory */ /* Goto $VERSION directory */
xchdir(uts.release); xchdir(uts.release);
} }