[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH v4 2/2] wic/engine: dump the partition table in JSON format only
From:       Pierre-Jean Texier via Openembedded-core <openembedded-core () lists ! openembedded ! o
Date:       2020-02-29 20:38:02
Message-ID: 1583008682-4650-2-git-send-email-pjtexier () koncepto ! io
[Download RAW message or body]

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>
---
Changes v3 -> v4
 - NONE

Changes v2 -> v3
 - New

 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 2479751..83c42c9 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -439,7 +439,7 @@ class Disk:
             outf.flush()
 
         def read_ptable(path):
-            out = exec_cmd("{} -dJ {}".format(self.sfdisk, path))
+            out = exec_cmd("{} -J {}".format(self.sfdisk, path))
             return json.loads(out)
 
         def write_ptable(parts, target):
-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[prev in list] [next in list] [prev in thread] [next in thread]