]> code.ossystems Code Review - openembedded-core.git/commit
wic/engine: dump the partition table in JSON format only
authorPierre-Jean Texier <pjtexier@koncepto.io>
Sat, 29 Feb 2020 20:38:02 +0000 (21:38 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 1 Mar 2020 10:39:49 +0000 (10:39 +0000)
commit49e7f3e8e3a775510d8b0e2826a06d000934706b
treeb834363e450f61eb9565aaa2bfed3de363c83351
parent324f33ba5a77d498cfff81c6857c78ad13b27125
wic/engine: dump the partition table in JSON format only

since commit 03154d2cf25c1d5ce908da9e72d324004b8d5722 ("sfdisk: add -J between mutually exclusive options")
in util-linux [1], the '-J' can't be used with the '-d' option anymore.

So, since we're using json format output, drop the '-d' option.

Fixes:

ERROR: _exec_cmd: <snip>/usr/sbin/sfdisk -dJ <snip>/core-image-minimal-qemux86-64.wic returned '1' instead of 0
output: sfdisk: mutually exclusive arguments: --list-free --json --dump

[1] - https://github.com/karelzak/util-linux/commit/03154d2cf25c1d5ce908da9e72d324004b8d5722#diff-31d5cc325380dbdafe64d0e019846f12

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/wic/engine.py