From 4e2075ceea72b3e7e753bf5c6c0e8c4a3b68cdd9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 20 Mar 2012 15:30:42 +0100 Subject: modules-load: drop /lib from search path if we don't have it split off --- src/modules-load.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/modules-load.c b/src/modules-load.c index 77fe3eaf26..ff1f690aac 100644 --- a/src/modules-load.c +++ b/src/modules-load.c @@ -58,7 +58,8 @@ int main(int argc, char *argv[]) { umask(0022); - if (!(ctx = kmod_new(NULL, NULL))) { + ctx = kmod_new(NULL, NULL); + if (!ctx) { log_error("Failed to allocate memory for kmod."); goto finish; } @@ -72,7 +73,9 @@ int main(int argc, char *argv[]) { "/run/modules-load.d", "/usr/local/lib/modules-load.d", "/usr/lib/modules-load.d", +#ifdef HAVE_SPLIT_USR "/lib/modules-load.d", +#endif NULL) < 0) { log_error("Failed to enumerate modules-load.d files: %s", strerror(-r)); goto finish; @@ -99,7 +102,7 @@ int main(int argc, char *argv[]) { struct kmod_list *itr, *modlist = NULL; int err; - if (!(fgets(line, sizeof(line), f))) + if (!fgets(line, sizeof(line), f)) break; l = strstrip(line); @@ -114,7 +117,9 @@ int main(int argc, char *argv[]) { } kmod_list_foreach(itr, modlist) { - struct kmod_module *mod = kmod_module_get_module(itr); + struct kmod_module *mod; + + mod = kmod_module_get_module(itr); err = kmod_module_probe_insert_module(mod, probe_flags, NULL, NULL, NULL, NULL); -- cgit v1.2.3-54-g00ecf