From 0bf686739a5e8a1193f5be5aa60afbf2ea1e5074 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Thu, 10 Nov 2016 13:18:33 +0100 Subject: wic: use partition size when creating empty partition files It seems that prepare_empty_partition_ext() and prepare_empty_partition_btrfs() got broken in commit c8669749e37fe865c197c98d5671d9de176ff4dd, thus one could observe the following backtrace: Backtrace: File "/poky/scripts/lib/wic/plugins/imager/direct_plugin.py", line 93, in do_create creator.create() File "/poky/scripts/lib/wic/imager/baseimager.py", line 159, in create self._create() File "/poky/scripts/lib/wic/imager/direct.py", line 290, in _create self.bootimg_dir, self.kernel_dir, self.native_sysroot) File "/poky/scripts/lib/wic/partition.py", line 146, in prepare method(rootfs, oe_builddir, native_sysroot) File "/poky/scripts/lib/wic/partition.py", line 325, in prepare_empty_partition_ext os.ftruncate(sparse.fileno(), rootfs_size * 1024) NameError: name 'rootfs_size' is not defined Signed-off-by: Maciej Borzecki Signed-off-by: Ross Burton --- scripts/lib/wic/partition.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 959035a971..f3835339af 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -314,7 +314,7 @@ class Partition(): Prepare an empty ext2/3/4 partition. """ with open(rootfs, 'w') as sparse: - os.ftruncate(sparse.fileno(), rootfs_size * 1024) + os.ftruncate(sparse.fileno(), self.size * 1024) extra_imagecmd = "-i 8192" @@ -332,7 +332,7 @@ class Partition(): Prepare an empty btrfs partition. """ with open(rootfs, 'w') as sparse: - os.ftruncate(sparse.fileno(), rootfs_size * 1024) + os.ftruncate(sparse.fileno(), self.size * 1024) label_str = "" if self.label: -- cgit 1.2.3-korg