diff options
| author | Karel Zak | 2016-02-01 14:30:31 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-02-01 14:30:31 +0100 |
| commit | c809b20aa404a79b1482f0fc850c2a61d09253f5 (patch) | |
| tree | 3d4794eb8e2176175b9c814e71e189a8f3817522 /disk-utils/sfdisk.c | |
| parent | sfdisk: add 'U' shortcut for ESP (diff) | |
| download | kernel-qcow2-util-linux-c809b20aa404a79b1482f0fc850c2a61d09253f5.tar.gz kernel-qcow2-util-linux-c809b20aa404a79b1482f0fc850c2a61d09253f5.tar.xz kernel-qcow2-util-linux-c809b20aa404a79b1482f0fc850c2a61d09253f5.zip | |
sfdisk: make --quiet really quiet
References: https://github.com/karelzak/util-linux/issues/268
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/sfdisk.c')
| -rw-r--r-- | disk-utils/sfdisk.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 8b213001b..4e99df53b 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1591,13 +1591,15 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) sf->prompt = xstrdup(SFDISK_PROMPT); } + if (sf->prompt && (sf->interactive || !sf->quiet)) { #ifndef HAVE_LIBREADLINE - if (sf->prompt) fputs(sf->prompt, stdout); #else - if (!sf->interactive && sf->prompt) - fputs(sf->prompt, stdout); + if (!sf->interactive) + fputs(sf->prompt, stdout); #endif + } + rc = fdisk_script_read_line(dp, stdin, buf, sizeof(buf)); if (rc < 0) { DBG(PARSE, ul_debug("script parsing failed, trying sfdisk specific commands")); |