]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
umount: fix log message
authorLennart Poettering <lennart@poettering.net>
Tue, 16 Nov 2021 09:09:29 +0000 (10:09 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 16 Nov 2021 14:08:29 +0000 (15:08 +0100)
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)

src/shutdown/umount.c

index e95d167a6e88f3a73ff46f6906f60705bb322492..f5a2cb20c105742e588748ae674078968af6e211 100644 (file)
@@ -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);