X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=e2ba8a0138607d1d4a17db5b7e0c2b505fff1643;hp=0db97f88bc159919544d5927317699593edb4060;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=b4d23205f238e06aaa31264628e20669e714acad

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 0db97f88b..e2ba8a013 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -62,7 +62,7 @@ static int disable_utf8(int fd) {
                 r = k;
 
         if (r < 0)
-                log_warning("Failed to disable UTF-8: %s", strerror(-r));
+                log_warning_errno(-r, "Failed to disable UTF-8: %m");
 
         return r;
 }
@@ -94,7 +94,7 @@ static int enable_utf8(int fd) {
                 r = k;
 
         if (r < 0)
-                log_warning("Failed to enable UTF-8: %s", strerror(-r));
+                log_warning_errno(-r, "Failed to enable UTF-8: %m");
 
         return r;
 }
@@ -282,7 +282,7 @@ int main(int argc, char **argv) {
                            NULL);
 
         if (r < 0 && r != -ENOENT)
-                log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
+                log_warning_errno(-r, "Failed to read /etc/vconsole.conf: %m");
 
         /* Let the kernel command line override /etc/vconsole.conf */
         if (detect_container(NULL) <= 0) {
@@ -295,7 +295,7 @@ int main(int argc, char **argv) {
                                    NULL);
 
                 if (r < 0 && r != -ENOENT)
-                        log_warning("Failed to read /proc/cmdline: %s", strerror(-r));
+                        log_warning_errno(-r, "Failed to read /proc/cmdline: %m");
         }
 
         if (utf8)
@@ -305,7 +305,7 @@ int main(int argc, char **argv) {
 
         r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
         if (r < 0) {
-                log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
+                log_error_errno(-r, "Failed to start " KBD_SETFONT ": %m");
                 return EXIT_FAILURE;
         }
 
@@ -314,7 +314,7 @@ int main(int argc, char **argv) {
 
         r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
         if (r < 0) {
-                log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
+                log_error_errno(-r, "Failed to start " KBD_LOADKEYS ": %m");
                 return EXIT_FAILURE;
         }