picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #13195 from keszybz/minor-rewordings

Browse source 
Minor rewordings
This commit is contained in:
Lennart Poettering 2019-07-26 18:42:16 +02:00 committed by GitHub
parent 6304fec37c a4d208018c
commit 2a2f3e7f3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
man/sysctl.d.xml
View file

@ -59,9 +59,11 @@
<filename>/proc/sys/net/ipv4/conf/enp3s0.200/forwarding</filename>.
</para>
<para>If a variable assignment is prefixed with a single <literal>-</literal> 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.</para>
<para>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 <literal>-</literal> 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).</para>
<para>The settings configured with <filename>sysctl.d</filename>
files will be applied early on boot. The network

4
src/boot/bootctl.c
View file

@ -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;