[PATCH] config: also parse softdeps from modules
From: Tom Gundersen <hidden>
Date: 2013-09-10 14:20:36
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. --- libkmod/libkmod-config.c | 2 ++ tools/depmod.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 24978c1..809815a 100644
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c@@ -879,6 +879,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 5855b2a..3d45c83 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c@@ -1963,8 +1963,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];
--
1.8.4