From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Thu, 1 Dec 2011 18:27:04 +0000 (-0200)
Subject: Lookup for alias in modules.alias.bin
X-Git-Tag: v1~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49e61ca347b302c1558bbe40add16eb4b6076af0;p=thirdparty%2Fkmod.git

Lookup for alias in modules.alias.bin
---

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index e0dfc073..f28678f0 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -185,6 +185,9 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx,
 	err = kmod_lookup_alias_from_symbols_file(ctx, alias, list);
 	CHECK_ERR_AND_FINISH(err, fail, list, finish);
 
+	err = kmod_lookup_alias_from_aliases_file(ctx, alias, list);
+	CHECK_ERR_AND_FINISH(err, fail, list, finish);
+
 finish:
 
 	return err;
diff --git a/libkmod/libkmod-private.h b/libkmod/libkmod-private.h
index c7ee24eb..417a24ad 100644
--- a/libkmod/libkmod-private.h
+++ b/libkmod/libkmod-private.h
@@ -58,6 +58,7 @@ struct kmod_list *kmod_list_remove_n_latest(struct kmod_list *list,
 const char *kmod_get_dirname(struct kmod_ctx *ctx) __attribute__((nonnull(1)));
 int kmod_lookup_alias_from_config(struct kmod_ctx *ctx, const char *name, struct kmod_list **list);
 int kmod_lookup_alias_from_symbols_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list);
+int kmod_lookup_alias_from_aliases_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list);
 int kmod_lookup_alias_from_moddep_file(struct kmod_ctx *ctx, const char *name, struct kmod_list **list);
 
 /* libkmod-config.c */
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 9e9fbe15..81c87164 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -326,6 +326,15 @@ int kmod_lookup_alias_from_symbols_file(struct kmod_ctx *ctx, const char *name,
 	return kmod_lookup_alias_from_alias_bin(ctx, symbols_file, name, list);
 }
 
+
+static const char *aliases_file = "modules.alias";
+
+int kmod_lookup_alias_from_aliases_file(struct kmod_ctx *ctx, const char *name,
+						struct kmod_list **list)
+{
+	return kmod_lookup_alias_from_alias_bin(ctx, aliases_file, name, list);
+}
+
 static const char *moddep_file = "modules.dep";
 
 int kmod_lookup_alias_from_moddep_file(struct kmod_ctx *ctx, const char *name,