]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mount: do not output (null) in option
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 19 Jun 2018 02:00:56 +0000 (11:00 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 19 Jun 2018 06:27:47 +0000 (08:27 +0200)
Fixes #9327.

src/mount/mount-tool.c

index e3fc94df162c2540cb1ac5cca0fed52081af11a9..64c1efdb1cff9eb3209eeabaff5452b465df5edc 100644 (file)
@@ -449,7 +449,7 @@ static int transient_mount_set_properties(sd_bus_message *m) {
                 r = asprintf(&options,
                              "uid=" UID_FMT ",gid=" GID_FMT "%s%s",
                              arg_uid, arg_gid,
-                             arg_mount_options ? "," : "", arg_mount_options);
+                             arg_mount_options ? "," : "", strempty(arg_mount_options));
                 if (r < 0)
                         return -ENOMEM;
         }