summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-07-15 13:40:22 +0200
committerGitHub <noreply@github.com>2020-07-15 13:40:22 +0200
commitb8ff0663e8a295150957ad24acb7f4cb953db9cf (patch)
tree7a4b8e92fe3c16fc20e29945ebff1463d4ebfd06
parentlogs: when embedding catalog info in log output use a dash of color and unicode (diff)
parenttest-fs-util: use log_info instead of printf (diff)
downloadsystemd-b8ff0663e8a295150957ad24acb7f4cb953db9cf.tar.xz
systemd-b8ff0663e8a295150957ad24acb7f4cb953db9cf.zip
Merge pull request #16468 from keszybz/two-unrelated-patches
Two unrelated patches
-rw-r--r--man/systemd-boot.xml1
-rw-r--r--src/test/test-fs-util.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml
index c3d7bc9d46..ee6ad1d533 100644
--- a/man/systemd-boot.xml
+++ b/man/systemd-boot.xml
@@ -167,6 +167,7 @@
<varlistentry>
<term><keycap>h</keycap></term>
<term><keycap>?</keycap></term>
+ <term><keycap>F1</keycap></term>
<listitem><para>Show a help screen</para></listitem>
</varlistentry>
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index 80c4c209b3..8d9a1974b2 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -858,7 +858,7 @@ static void test_path_is_encrypted_one(const char *p, int expect) {
return;
assert_se(r >= 0);
- printf("%s encrypted: %s\n", p, yes_no(r));
+ log_info("%s encrypted: %s", p, yes_no(r));
assert_se(expect < 0 || ((r > 0) == (expect > 0)));
}