SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mkfs-util: Add quiet argument to make_filesystem()

Browse Source 
We default to quiet operation everywhere except for repart, where
we disable quiet and have the mkfs tools write to stdout.

We also make sure --quiet or equivalent is implemented for all mkfs
tools.
This commit is contained in:
Daan De Meyer
2023-05-12 07:51:50 +02:00
parent aaa27e2e21
commit 2bc161dddb
6 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/mkfs-util.c
+29 -12
View File
@@ -264,6 +264,7 @@ int make_filesystem(
const char *root,
sd_id128_t uuid,
bool discard,
bool quiet,
uint64_t sector_size,
char * const *extra_mkfs_args) {
@@ -355,7 +356,6 @@ int make_filesystem(
/* When changing this conditional, also adjust the log statement below. */
if (STR_IN_SET(fstype, "ext2", "ext3", "ext4")) {
argv = strv_new(mkfs,
"-q",
"-L", label,
"-U", vol_id,
"-I", "256",
@@ -368,9 +368,11 @@ int make_filesystem(
if (root && strv_extend_strv(&argv, STRV_MAKE("-d", root), false) < 0)
return log_oom();
if (quiet && strv_extend(&argv, "-q") < 0)
return log_oom();
} else if (streq(fstype, "btrfs")) {
argv = strv_new(mkfs,
"-q",
"-L", label,
"-U", vol_id,
node);
@@ -383,9 +385,11 @@ int make_filesystem(
if (root && strv_extend_strv(&argv, STRV_MAKE("-r", root), false) < 0)
return log_oom();
if (quiet && strv_extend(&argv, "-q") < 0)
return log_oom();
} else if (streq(fstype, "f2fs")) {
argv = strv_new(mkfs,
"-q",
"-g", /* "default options" */
"-f", /* force override, without this it doesn't seem to want to write to an empty partition */
"-l", label,
@@ -393,13 +397,15 @@ int make_filesystem(
"-t", one_zero(discard),
node);
if (quiet && strv_extend(&argv, "-q") < 0)
return log_oom();
} else if (streq(fstype, "xfs")) {
const char *j;
j = strjoina("uuid=", vol_id);
argv = strv_new(mkfs,
"-q",
"-L", label,
"-m", j,
"-m", "reflink=1",
@@ -427,6 +433,9 @@ int make_filesystem(
return log_oom();
}
if (quiet && strv_extend(&argv, "-q") < 0)
return log_oom();
} else if (streq(fstype, "vfat")) {
argv = strv_new(mkfs,
@@ -444,32 +453,40 @@ int make_filesystem(
}
/* mkfs.vfat does not have a --quiet option so let's redirect stdout to /dev/null instead. */
stdio_fds[1] = -EBADF;
if (quiet)
stdio_fds[1] = -EBADF;
} else if (streq(fstype, "swap"))
/* TODO: add --quiet here if
* https://github.com/util-linux/util-linux/issues/1499 resolved. */
} else if (streq(fstype, "swap")) {
/* TODO: add --quiet once util-linux v2.38 is available everywhere. */
argv = strv_new(mkfs,
"-L", label,
"-U", vol_id,
node);
else if (streq(fstype, "squashfs")) {
if (quiet)
stdio_fds[1] = -EBADF;
} else if (streq(fstype, "squashfs")) {
argv = strv_new(mkfs,
root, node,
"-noappend");
/* mksquashfs -quiet option is pretty new so let's redirect stdout to /dev/null instead. */
stdio_fds[1] = -EBADF;
if (quiet)
stdio_fds[1] = -EBADF;
} else if (streq(fstype, "erofs"))
} else if (streq(fstype, "erofs")) {
argv = strv_new(mkfs,
"-U", vol_id,
node, root);
else
if (quiet && strv_extend(&argv, "--quiet") < 0)
return log_oom();
} else
/* Generic fallback for all other file systems */
argv = strv_new(mkfs, node);
src/shared/mkfs-util.h
+1
View File
@@ -18,6 +18,7 @@ int make_filesystem(
const char *root,
sd_id128_t uuid,
bool discard,
bool quiet,
uint64_t sector_size,
char * const *extra_mkfs_args);