diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-03-31 15:18:51 +0200 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2014-04-01 08:13:54 -0300 |
| commit | 8240333b257e96e7dc2ac2522f8bb7fb2158fafc (patch) | |
| tree | e3cba84c4aca0a91dd0ccbbe0b4b51c7890214a0 | |
| parent | 450bd1b4290e0dec65397881a7037090f203045a (diff) | |
| download | kmod-8240333b257e96e7dc2ac2522f8bb7fb2158fafc.tar.gz kmod-8240333b257e96e7dc2ac2522f8bb7fb2158fafc.tar.bz2 kmod-8240333b257e96e7dc2ac2522f8bb7fb2158fafc.zip | |
config: also parse softdeps from modules
This information can be found in /lib/modules/`uname -r`/modules.softdep, and
has only recently been exported by the kernel.
Also remove the advice about copying modules.softdep to /lib/modules as it is
not clear how to do this correctly with several kernels installed with
potentially conflicting soft dependencies.
| -rw-r--r-- | libkmod/libkmod-config.c | 2 | ||||
| -rw-r--r-- | tools/depmod.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c index 9905d5e..0953924 100644 --- a/libkmod/libkmod-config.c +++ b/libkmod/libkmod-config.c @@ -848,6 +848,8 @@ int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **p_config, struct kmod_list *path_list = NULL; size_t i; + conf_files_insert_sorted(ctx, &list, kmod_get_dirname(ctx), "modules.softdep"); + for (i = 0; config_paths[i] != NULL; i++) { const char *path = config_paths[i]; unsigned long long path_stamp = 0; diff --git a/tools/depmod.c b/tools/depmod.c index 37e6afd..1aedaaf 100644 --- a/tools/depmod.c +++ b/tools/depmod.c @@ -1952,8 +1952,6 @@ static int output_softdeps(struct depmod *depmod, FILE *out) size_t i; fputs("# Soft dependencies extracted from modules themselves.\n", out); - fputs("# Copy, with a .conf extension, to /etc/modprobe.d to use " - "it with modprobe.\n", out); for (i = 0; i < depmod->modules.count; i++) { const struct mod *mod = depmod->modules.array[i]; |