]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/mount-setup: use '' to signify empty option string 36921/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 1 Apr 2025 09:08:33 +0000 (11:08 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 1 Apr 2025 09:28:00 +0000 (11:28 +0200)
We said:
systemd[1]: Mounting efivarfs to /sys/firmware/efi/efivars of type efivarfs with options n/a.
I think '' is clearer.

src/shared/mount-setup.c

index db963df39e6d4e2cd242d7431b6df4f2f7577992..e7712fa27408e79a83344eba534fcbbc776cf336 100644 (file)
@@ -206,7 +206,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
                   p->what,
                   p->where,
                   p->type,
-                  strna(o));
+                  o ?: "''");
 
         r = mount_verbose_full(priority, p->what, p->where, p->type, p->flags, o, FLAGS_SET(p->mode, MNT_FOLLOW_SYMLINK));
         if (r < 0)