]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
partition, random-seed, logind: fix log messages with %m
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 14 Apr 2021 10:14:01 +0000 (06:14 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 14 Apr 2021 14:19:54 +0000 (16:19 +0200)
We would print "...: Success", which is not too terrible, but not pretty
either.

src/login/logind.c
src/partition/repart.c
src/random-seed/random-seed.c

index 4887889facb482d61f3f36b8ad39d624428c486c..f461f03ec4fcb54ba0fd305da65e1d27373515f9 100644 (file)
@@ -268,8 +268,8 @@ static int manager_enumerate_seats(Manager *m) {
                 s = hashmap_get(m->seats, de->d_name);
                 if (!s) {
                         if (unlinkat(dirfd(d), de->d_name, 0) < 0)
-                                log_warning("Failed to remove /run/systemd/seats/%s: %m",
-                                            de->d_name);
+                                log_warning_errno(errno, "Failed to remove /run/systemd/seats/%s: %m",
+                                                  de->d_name);
                         continue;
                 }
 
index 195a909bf3899b2899ea791719f72ba923ac4ae8..04d5bb18f42ed2609d517f08172e4f2348f5961a 100644 (file)
@@ -3830,7 +3830,7 @@ static int parse_efi_variable_factory_reset(void) {
 
         arg_factory_reset = r;
         if (r)
-                log_notice("Honouring factory reset requested via EFI variable FactoryReset: %m");
+                log_notice("Factory reset requested via EFI variable FactoryReset.");
 
         return 0;
 }
index 4caf9678071ac5e534dc838df8448830c8894265..e003ca60e3c39281a25a278254bc38569fa21df9 100644 (file)
@@ -262,7 +262,7 @@ static int run(int argc, char *argv[]) {
                 if (k < 0)
                         log_debug_errno(errno, "Failed to read random data with getrandom(), falling back to /dev/urandom: %m");
                 else if ((size_t) k < buf_size)
-                        log_debug("Short read from getrandom(), falling back to /dev/urandom: %m");
+                        log_debug("Short read from getrandom(), falling back to /dev/urandom.");
                 else
                         getrandom_worked = true;