[oe-commits] [openembedded-core] 02/16: Revert "wic/utils/partitionedfs.py: assemble .wic images as sparse files"

git at git.openembedded.org git at git.openembedded.org
Tue Apr 12 21:51:25 UTC 2016


rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 6733d0413891fb91f3e8517334f3be9265a9dc00
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Apr 12 15:51:50 2016 +0100

    Revert "wic/utils/partitionedfs.py: assemble .wic images as sparse files"
    
    It turns out that dd's conv=sparse doesn't look at the file extents, but simply
    checks if a "block" is all zero.  If the block of zero was meaningful it gets
    lost and if the image is subsequently written to media using a sparse-aware
    writer then the block of zeros won't be written at all.
    
    This reverts commit 5fd592fbae2e046bcb8c3a6c3ef4993fe0400676.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/wic/utils/partitionedfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 3e2b420..5a103bb 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -340,7 +340,7 @@ class Image(object):
             source = part['source_file']
             if source:
                 # install source_file contents into a partition
-                cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc,sparse" % \
+                cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc" % \
                       (source, image_file, self.sector_size,
                        part['start'], part['size'])
                 exec_cmd(cmd)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list