X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmodules-load%2Fmodules-load.c;h=99aa429ed81a6797815171868cd4ac4e53371bcf;hb=c33b329709ebe2755181980a050d02ec7c81ed87;hp=c676fd1c1890cd89903dfebb2b470f7c290659f7;hpb=7f0a55d4325f7df91f91b3b818f61f97d78df14a;p=elogind.git

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index c676fd1c1..99aa429ed 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -44,7 +44,7 @@ static void systemd_kmod_log(void *data, int priority, const char *file, int lin
                              const char *fn, const char *format, va_list args) {
 
         DISABLE_WARNING_FORMAT_NONLITERAL;
-        log_metav(priority, file, line, fn, format, args);
+        log_internalv(priority, 0, file, line, fn, format, args);
         REENABLE_WARNING;
 }
 
@@ -82,7 +82,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
 
         r = kmod_module_new_from_lookup(ctx, m, &modlist);
         if (r < 0) {
-                log_error("Failed to lookup alias '%s': %s", m, strerror(-r));
+                log_error_errno(r, "Failed to lookup alias '%s': %m", m);
                 return r;
         }
 
@@ -116,8 +116,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
                         else if (err == KMOD_PROBE_APPLY_BLACKLIST)
                                 log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
                         else {
-                                log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
-                                          strerror(-err));
+                                log_error_errno(err, "Failed to insert '%s': %m", kmod_module_get_name(mod));
                                 r = err;
                         }
                 }
@@ -142,7 +141,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
                 if (ignore_enoent && r == -ENOENT)
                         return 0;
 
-                log_error("Failed to open %s, ignoring: %s", path, strerror(-r));
+                log_error_errno(r, "Failed to open %s, ignoring: %m", path);
                 return r;
         }
 
@@ -237,7 +236,7 @@ int main(int argc, char *argv[]) {
 
         r = parse_proc_cmdline(parse_proc_cmdline_item);
         if (r < 0)
-                log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
+                log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
 
         ctx = kmod_new(NULL, NULL);
         if (!ctx) {
@@ -271,7 +270,7 @@ int main(int argc, char *argv[]) {
 
                 k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
                 if (k < 0) {
-                        log_error("Failed to enumerate modules-load.d files: %s", strerror(-k));
+                        log_error_errno(k, "Failed to enumerate modules-load.d files: %m");
                         if (r == 0)
                                 r = k;
                         goto finish;