From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 16 Nov 2021 09:09:29 +0000 (+0100)
Subject: umount: fix log message
X-Git-Tag: v250-rc1~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6c3a32056fbcf1178c45204139176e1e414dee1;p=thirdparty%2Fsystemd.git

umount: fix log message

The sentence wasn't correct English language, let's fix that. More
importantly: if the mount options are empty we'd display "(null)" here.
Fix that. (And they can be empty IRL, see CI results)
---

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index e95d167a6e8..f5a2cb20c10 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -522,7 +522,7 @@ static int remount_with_timeout(MountPoint *m, int umount_log_level) {
         if (r < 0)
                 return r;
         if (r == 0) {
-                log_info("Remounting '%s' read-only in with options '%s'.", m->path, m->remount_options);
+                log_info("Remounting '%s' read-only with options '%s'.", m->path, strna(m->remount_options));
 
                 /* Start the mount operation here in the child */
                 r = mount(NULL, m->path, NULL, m->remount_flags, m->remount_options);