From 48ff3fa3a50add60ff69a0067d189adcfa356bd6 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Mon, 22 Sep 2014 13:35:15 +0200 Subject: wic: fix vfat partition sector count only if needed VFAT rootfs partitions sector count would get updated always even if there is no need. Since parition size in wic is expressed in MB, any sub MB change will cause the generated partition image to be larger than allocated space within the disk image. Fortunately, partitions sized in MB will most of the time have a proper sector count. (From OE-Core rev: 99bee4cb489800d74dea4d2158ff834413685f04) Signed-off-by: Maciej Borzecki Signed-off-by: Maciek Borzecki Signed-off-by: Richard Purdie --- scripts/lib/wic/kickstart/custom_commands/partition.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index f41d136d8f..8b0ace6299 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py @@ -318,9 +318,11 @@ class Wic_PartData(Mic_PartData): # Ensure total sectors is an integral number of sectors per # track or mcopy will complain. Sectors are 512 bytes, and we - # generate images with 32 sectors per track. This calculation is - # done in blocks, thus the mod by 16 instead of 32. - blocks += (16 - (blocks % 16)) + # generate images with 32 sectors per track. This calculation + # is done in blocks, thus the mod by 16 instead of 32. Apply + # sector count fix only when needed. + if blocks % 16 != 0: + blocks += (16 - (blocks % 16)) dosfs_cmd = "mkdosfs -n boot -S 512 -C %s %d" % (rootfs, blocks) exec_native_cmd(dosfs_cmd, native_sysroot) -- cgit v1.2.3-54-g00ecf