tools: improve error logs to specify in which dirname is the module missing

Currently if no module is found in MODULE_DIRECTORY, kmod will
just print "Module %s not found", but now that we have two
search path, it is worth specifying which is the path that was
not found.

TODO: ERR() produces a not so pleasant to see error which might
confuse the user, especially if a module is in
MODULE_ALTERNATIVE_DIRECTORY and not in MODULE_DIRECTORY, because
we would have such output:
modprobe: ERROR: Module %s not found in directory <MODULE_DIRECTORY>
<output foud in MODULE_ALTERNATIVE_DIRECTORY>

Signed-off-by: Emanuele Giuseppe Esposito <[email protected]>

Author: esposem

tools/modinfo.c

@@ -265,7 +265,8 @@ static int modinfo_path_do(struct kmod_ctx *ctx, const char *path)
 	struct kmod_module *mod;
 	int err = kmod_module_new_from_path(ctx, path, &mod);
 	if (err < 0) {
-		ERR("Module file %s not found.\n", path);
+		ERR("Module file %s not found in %s.\n", path,
+		    kmod_get_dirname(ctx));
 		return err;
 	}
 	err = modinfo_do(mod);
@@ -280,7 +281,8 @@ static int modinfo_name_do(struct kmod_ctx *ctx, const char *name)
 
 	err = kmod_module_new_from_name_lookup(ctx, name, &mod);
 	if (err < 0 || mod == NULL) {
-		ERR("Module name %s not found.\n", name);
+		ERR("Module name %s not found in %s.\n", name,
+		    kmod_get_dirname(ctx));
 		return err < 0 ? err : -ENOENT;
 	}
 
@@ -295,12 +297,14 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
 	struct kmod_list *l, *list = NULL;
 	int err = kmod_module_new_from_lookup(ctx, alias, &list);
 	if (err < 0) {
-		ERR("Module alias %s not found.\n", alias);
+		ERR("Module alias %s not found in %s.\n", alias,
+		    kmod_get_dirname(ctx));
 		return err;
 	}
 
 	if (list == NULL) {
-		ERR("Module %s not found.\n", alias);
+		ERR("Module %s not found in %s.\n", alias,
+		    kmod_get_dirname(ctx));
 		return -ENOENT;
 	}
 

tools/modprobe.c

@@ -210,7 +210,8 @@ static int show_modversions(struct kmod_ctx *ctx, const char *filename)
 	struct kmod_module *mod;
 	int err = kmod_module_new_from_path(ctx, filename, &mod);
 	if (err < 0) {
-		LOG("Module %s not found.\n", filename);
+		LOG("Module %s not found in %s.\n", filename,
+		    kmod_get_dirname(ctx));
 		return err;
 	}
 
@@ -237,7 +238,8 @@ static int show_exports(struct kmod_ctx *ctx, const char *filename)
 	struct kmod_module *mod;
 	int err = kmod_module_new_from_path(ctx, filename, &mod);
 	if (err < 0) {
-		LOG("Module %s not found.\n", filename);
+		LOG("Module %s not found in %s.\n", filename,
+		    kmod_get_dirname(ctx));
 		return err;
 	}
 
@@ -500,7 +502,7 @@ static int rmmod(struct kmod_ctx *ctx, const char *alias)
 		return err;
 
 	if (list == NULL) {
-		LOG("Module %s not found.\n", alias);
+		LOG("Module %s not found in %s.\n", alias, kmod_get_dirname(ctx));
 		err = -ENOENT;
 	}