summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Niebel <Markus.Niebel@ew.tq-group.com>2023-08-18 13:44:13 +0200
committerSteve Sakoman <steve@sakoman.com>2023-09-04 04:13:25 -1000
commitd7755c7e12736b5caa765d76e0a5e5fc15863d72 (patch)
treeda0fecc489cc1afe0c4f50d2c35a683d70959bb0 /scripts
parente2c3c0315cf954605cb874ecea9acf138138b61c (diff)
downloadpoky-d7755c7e12736b5caa765d76e0a5e5fc15863d72.tar.gz
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 <Markus.Niebel@ew.tq-group.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit db771a4cd36bf291a8b68edfd905e03243f2c8b3) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/partition.py2
1 files changed, 1 insertions, 1 deletions
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():
133 self.update_fstab_in_rootfs = True 133 self.update_fstab_in_rootfs = True
134 134
135 if not self.source: 135 if not self.source:
136 if self.fstype == "none": 136 if self.fstype == "none" or self.no_table:
137 return 137 return
138 if not self.size and not self.fixed_size: 138 if not self.size and not self.fixed_size:
139 raise WicError("The %s partition has a size of zero. Please " 139 raise WicError("The %s partition has a size of zero. Please "