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-23 05:26:16 -1000
commitd95804e5843525cde59846c8714b853e21534a65 (patch)
tree45d7ce32b17b60582e53f7d86dff97df0a39ce19 /scripts
parentd749d2f33e4c43dd776d3d3c19b922c109250716 (diff)
downloadpoky-d95804e5843525cde59846c8714b853e21534a65.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: af9f392a5e259b681077f25fa263965714a73a05) 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 dce5d1485b..5275da6ed3 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -132,7 +132,7 @@ class Partition():
132 self.update_fstab_in_rootfs = True 132 self.update_fstab_in_rootfs = True
133 133
134 if not self.source: 134 if not self.source:
135 if self.fstype == "none": 135 if self.fstype == "none" or self.no_table:
136 return 136 return
137 if not self.size and not self.fixed_size: 137 if not self.size and not self.fixed_size:
138 raise WicError("The %s partition has a size of zero. Please " 138 raise WicError("The %s partition has a size of zero. Please "