diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2020-11-04 12:35:38 +0000 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2020-11-04 12:47:55 +0000 |
| commit | d7101e5911fe251eed1a0913504cac884f195847 (patch) | |
| tree | af11cd79bbb38a7c3747ed142ba4c11912b42687 /disk-utils/sfdisk.c | |
| parent | ebb5ca72f4f0a18c61bc3935a1c7b769d7f3408a (diff) | |
| download | util-linux-d7101e5911fe251eed1a0913504cac884f195847.tar.gz | |
sfdisk: correct --json --dump false exclusive
`--json` implies `--dump`, thus `--json --dump` must be
allowed. `--list-free` is incompatible with `--dump`, and thus also
with `--json`. Currently `--json --dump` is prohibited, even though
`--list-free` is not specified at all.
Regression introduced in 03154d2cf25c1d5ce908da9e72d324004b8d5722.
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
Diffstat (limited to 'disk-utils/sfdisk.c')
| -rw-r--r-- | disk-utils/sfdisk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 4e12f87a5c..804181964f 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -2165,7 +2165,8 @@ int main(int argc, char *argv[]) { NULL, 0, NULL, 0 }, }; static const ul_excl_t excl[] = { /* rows and cols in ASCII order */ - { 'F','J','d'}, /* --list-free --json --dump */ + { 'F','d'}, /* --list-free --dump */ + { 'F','J'}, /* --list-free --json */ { 's','u'}, /* --show-size --unit */ { 0 } }; |