partition, random-seed, logind: fix log messages with %m

keszybz · keszybz · commit 111a3aae71fa · 2021-04-14T16:19:54.000+02:00
We would print "...: Success", which is not too terrible, but not pretty
either.
diff --git a/src/login/logind.c b/src/login/logind.c
@@ -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;
                 }
 
diff --git a/src/partition/repart.c b/src/partition/repart.c
@@ -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;
 }
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -3830,7 +3830,7 @@ static int parse_efi_variable_factory_reset(void) {`
`3830`	`3830`
`3831`	`3831`	`arg_factory_reset = r;`
`3832`	`3832`	`if (r)`
`3833`		`- log_notice("Honouring factory reset requested via EFI variable FactoryReset: %m");`
	`3833`	`+ log_notice("Factory reset requested via EFI variable FactoryReset.");`
`3834`	`3834`
`3835`	`3835`	`return 0;`
`3836`	`3836`	`}`