73298175ea0579 downgraded an error to a debug statement, causing
modprobe to exit silently and non-zero when module indicies couldn't be
found. This was done to satisfy users of static kernels who still had
udev installed and linked to kmod.
This change resurfaces the error in modprobe and causes it to exit
non-zero when the module indicies cannot be found.
---
tools/modprobe.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/modprobe.c b/tools/modprobe.c
index 437dea3..f0624e6 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -900,7 +900,11 @@ static int do_modprobe(int argc, char **orig_argv)
log_setup_kmod_log(ctx, verbose);
- kmod_load_resources(ctx);
+ if (kmod_load_resources(ctx) < 0) {
+ ERR("failed to load module indicies: %m\n");
+ err = -1;
+ goto done;
+ }
if (do_show_config)
err = show_config(ctx);
--
1.8.0.3
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
