Merge pull request #16468 from keszybz/two-unrelated-patches

Two unrelated patches

diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml
index c3d7bc9d4687b66c454837896d564e4c3eac08d3..ee6ad1d533304f107871ab84972a85f6f108b9e8 100644 (file)
--- 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 80c4c209b3f5727c7c3ff82f299e6e39fe19ec81..8d9a1974b24de4c1b65948a51e5505ca0b83fa8d 100644 (file)
--- 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)));
 }