diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-11-08 12:12:58 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-11-09 09:12:01 +0100 |
| commit | 44cdeb6e33d8d2c9f32e1c46ce402d5311ae6a0b (patch) | |
| tree | f7f326bb94c3bd950cc3778375d3f67b4eba016d | |
| parent | bf47f71c1cd36c2b0eb5aeac4d8bdf58c67f2b33 (diff) | |
| download | systemd-44cdeb6e33d8d2c9f32e1c46ce402d5311ae6a0b.tar.gz | |
makefs: reindent mkfs calls to follow the same style
I think this also makes it much easier to see what args are passed.
| -rw-r--r-- | src/shared/mkfs-util.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c index 924afdfd93..b9c2f147bc 100644 --- a/src/shared/mkfs-util.c +++ b/src/shared/mkfs-util.c @@ -75,23 +75,29 @@ int make_filesystem( "-I", "256", "-O", "has_journal", "-m", "0", - "-E", discard ? "lazy_itable_init=1,discard" : "lazy_itable_init=1,nodiscard", + "-E", discard ? "discard,lazy_itable_init=1" : "nodiscard,lazy_itable_init=1", node, NULL); else if (streq(fstype, "btrfs")) { - if (discard) - (void) execlp(mkfs, mkfs, "-L", label, "-U", ID128_TO_UUID_STRING(uuid), node, NULL); - else - (void) execlp(mkfs, mkfs, "-L", label, "-U", ID128_TO_UUID_STRING(uuid), "--nodiscard", node, NULL); + (void) execlp(mkfs, mkfs, + "-L", label, + "-U", ID128_TO_UUID_STRING(uuid), + node, + discard ? NULL : "--nodiscard", + NULL); } else if (streq(fstype, "xfs")) { const char *j; j = strjoina("uuid=", ID128_TO_UUID_STRING(uuid)); - if (discard) - (void) execlp(mkfs, mkfs, "-L", label, "-m", j, "-m", "reflink=1", node, NULL); - else - (void) execlp(mkfs, mkfs, "-L", label, "-m", j, "-m", "reflink=1", "-K", node, NULL); + + (void) execlp(mkfs, mkfs, + "-L", label, + "-m", j, + "-m", "reflink=1", + node, + discard ? NULL : "-K", + NULL); } else if (streq(fstype, "vfat")) { char mangled_label[8 + 3 + 1], vol_id[8 + 1]; |