Lookup for alias in modules.alias.bin

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index e0dfc0734c22d5d58b1664c1991c5150b9ed7a8d..f28678f0ad61f4139caddb8d48bb260bfa89f2d8 100644 (file)
--- 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 c7ee24eb1a0638365abfd4cd05ee4f207208e86b..417a24ade198c4c813cbaffd1aaf68ed15951708 100644 (file)
--- 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 9e9fbe15594682b88f7c43364a8ddc6703573d4a..81c87164415659d82c48d9d91fe6ce083948bf67 100644 (file)
--- 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,