From d7755c7e12736b5caa765d76e0a5e5fc15863d72 Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Fri, 18 Aug 2023 13:44:13 +0200 Subject: wic: fix wrong attempt to create file system in upartitioned regions The kickstart parser defaults fstype to "vfat". This leads to an attempt to create an empty file system even for regions configured with "--no-table" if used without fstype when no --sourceparams given. The fix tests for fstype "none" or no_table in Partition prepare method. This will omit the file system creation an the potential error for small region with --no-table option. (From OE-Core rev: 47b395fe2dc393e82d0a42cfab96d134c1397a43) Signed-off-by: Markus Niebel Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit db771a4cd36bf291a8b68edfd905e03243f2c8b3) Signed-off-by: Steve Sakoman --- scripts/lib/wic/partition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib/wic/partition.py') diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 382afa44bc..29b9dc4457 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -133,7 +133,7 @@ class Partition(): self.update_fstab_in_rootfs = True if not self.source: - if self.fstype == "none": + if self.fstype == "none" or self.no_table: return if not self.size and not self.fixed_size: raise WicError("The %s partition has a size of zero. Please " -- cgit v1.2.3-54-g00ecf