From e29deac69ed29226b68001db2fcfb3ed24c0568a Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Tue, 7 Mar 2017 14:41:56 +0100 Subject: wic: filemap: Fixed spared_copy skip This patches removes the empty space in front of the copied file which was skipped. Without this reduction it's not possible to place a partition with rawcopy and skip parameter on a desired alignment. Signed-off-by: Daniel Schultz Signed-off-by: Ross Burton (cherry picked from commit 5c024d71f9413b81ee1707dbc41f0721f8f27bdb) Signed-off-by: Armin Kuster --- scripts/lib/wic/filemap.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py index f3240ba8d8..162603ed0a 100644 --- a/scripts/lib/wic/filemap.py +++ b/scripts/lib/wic/filemap.py @@ -543,9 +543,9 @@ def sparse_copy(src_fname, dst_fname, offset=0, skip=0): end = (last + 1) * fmap.block_size if start < skip < end: - start = skip - - fmap._f_image.seek(start, os.SEEK_SET) + fmap._f_image.seek(skip, os.SEEK_SET) + else: + fmap._f_image.seek(start, os.SEEK_SET) dst_file.seek(offset + start, os.SEEK_SET) chunk_size = 1024 * 1024 -- cgit 1.2.3-korg