summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/wic/engine.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 94992365df..fe036f60e9 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -391,11 +391,8 @@ class Disk:
391 def write_ptable(parts, target): 391 def write_ptable(parts, target):
392 with tempfile.NamedTemporaryFile(prefix="wic-sfdisk-", mode='w') as outf: 392 with tempfile.NamedTemporaryFile(prefix="wic-sfdisk-", mode='w') as outf:
393 write_sfdisk_script(outf, parts) 393 write_sfdisk_script(outf, parts)
394 cmd = "{} --no-reread {} < {} 2>/dev/null".format(self.sfdisk, target, outf.name) 394 cmd = "{} --no-reread {} < {} ".format(self.sfdisk, target, outf.name)
395 try: 395 exec_cmd(cmd, as_shell=True)
396 subprocess.check_output(cmd, shell=True)
397 except subprocess.CalledProcessError as err:
398 raise WicError("Can't run '{}' command: {}".format(cmd, err))
399 396
400 if expand is None: 397 if expand is None:
401 sparse_copy(self.imagepath, target) 398 sparse_copy(self.imagepath, target)
@@ -412,6 +409,8 @@ class Disk:
412 for line in exec_cmd("{} -F {}".format(self.sfdisk, target)).splitlines(): 409 for line in exec_cmd("{} -F {}".format(self.sfdisk, target)).splitlines():
413 if line.startswith("Unpartitioned space ") and line.endswith("sectors"): 410 if line.startswith("Unpartitioned space ") and line.endswith("sectors"):
414 free = int(line.split()[-2]) 411 free = int(line.split()[-2])
412 # Align free space to a 2048 sector boundary. YOCTO #12840.
413 free = free - (free % 2048)
415 if free is None: 414 if free is None:
416 raise WicError("Can't get size of unpartitioned space") 415 raise WicError("Can't get size of unpartitioned space")
417 416