From 1774d03fb2bf7734b4c56c1a53b536b623804082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 26 Jul 2019 15:01:36 +0200 Subject: [PATCH 1/2] man: reword description of "-" for sysctl.d Follow-up for e08be64937. --- man/sysctl.d.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 21ef6de97c..4932948178 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -59,9 +59,11 @@ /proc/sys/net/ipv4/conf/enp3s0.200/forwarding. - If a variable assignment is prefixed with a single - character, any attempts to - set it that fail will be ignored (though are logged). Moreover, any access permission errors, and - attempts to write variables not defined on the local system are ignored (and logged) too. + Any access permission errors and attempts to write variables not defined on the local system are + logged, but do not cause the the service to fail. Moreover, if a variable assignment is prefixed with a + single - character, failure to set the variable will be logged, but will not cause the + service to fail. All other errors when setting variables cause the service to return failure at the end + (other variables are still processed). The settings configured with sysctl.d files will be applied early on boot. The network From a4d208018c369e422ee48cd7fb1b4b57787e2618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 26 Jul 2019 15:05:18 +0200 Subject: [PATCH 2/2] bootctl: log message tweaks Follow-up for e44c3229f22459b189c1e79cb01fdb156672eb93. --- src/boot/bootctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index e7cf73e1a1..9ecd9f78f3 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -1361,7 +1361,7 @@ static int install_random_seed(const char *esp) { r = genuine_random_bytes(buffer, sz, RANDOM_BLOCK); if (r < 0) - return log_error_errno(r, "Faile to acquire random seed: %m"); + return log_error_errno(r, "Failed to acquire random seed: %m"); r = tempfn_random(path, "bootctl", &tmp); if (r < 0) @@ -1384,7 +1384,7 @@ static int install_random_seed(const char *esp) { tmp = mfree(tmp); - log_info("Successfully written random seed file %s with %zu bytes.", path, sz); + log_info("Random seed file %s successfully written (%zu bytes).", path, sz); if (!arg_touch_variables) return 0;