]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
MountImages: fix exec_context_dump printf
authorLuca Boccassi <luca.boccassi@microsoft.com>
Mon, 22 Feb 2021 10:12:34 +0000 (10:12 +0000)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 22 Feb 2021 19:42:39 +0000 (04:42 +0900)
Use strempty as options might not be set, and add the separator
for each option tuple

src/core/execute.c

index d14aec47d0e606dccb63198978c69834c518a200..d27adbbba54277282fd755609ae0c6e354baa023 100644 (file)
@@ -5648,15 +5648,14 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
         for (size_t i = 0; i < c->n_mount_images; i++) {
                 MountOptions *o;
 
-                fprintf(f, "%sMountImages: %s%s:%s%s", prefix,
+                fprintf(f, "%sMountImages: %s%s:%s", prefix,
                         c->mount_images[i].ignore_enoent ? "-": "",
                         c->mount_images[i].source,
-                        c->mount_images[i].destination,
-                        LIST_IS_EMPTY(c->mount_images[i].mount_options) ? "": ":");
+                        c->mount_images[i].destination);
                 LIST_FOREACH(mount_options, o, c->mount_images[i].mount_options)
-                        fprintf(f, "%s:%s",
+                        fprintf(f, ":%s:%s",
                                 partition_designator_to_string(o->partition_designator),
-                                o->options);
+                                strempty(o->options));
                 fprintf(f, "\n");
         }
 }