summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMaciej Borzecki <maciej.borzecki@rndity.com>2016-11-10 13:18:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:42 +0000
commit0a25fbfdb4e7eac69c6247684853c6b203a22d98 (patch)
tree69e3c2042c0add28ab2b1232fcb4bd6224ca59d5 /scripts
parent0c5596e5d34b368d6aad84636543d154618ef639 (diff)
downloadpoky-0a25fbfdb4e7eac69c6247684853c6b203a22d98.tar.gz
wic: check that filesystem is specified for a rootfs partition
We explicitly check for --fstype if no source was provided for a partition. However, this was not the case for rootfs partitions. Make sure to raise an error if filesystem was left unspecified when preparing a rootfs partition image. (From OE-Core rev: b8c35fcad57810a87aa25ebeb533adf286eed565) (From OE-Core rev: dc4d1cfc4d6bd01432857448f66af5492cad7574) Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/partition.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 30bb05a249..3b3bd2d78f 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -190,6 +190,10 @@ class Partition():
190 if os.path.isfile(rootfs): 190 if os.path.isfile(rootfs):
191 os.remove(rootfs) 191 os.remove(rootfs)
192 192
193 if not self.fstype:
194 msger.error("File system for partition %s not specified in kickstart, " \
195 "use --fstype option" % (self.mountpoint))
196
193 for prefix in ("ext", "btrfs", "vfat", "squashfs"): 197 for prefix in ("ext", "btrfs", "vfat", "squashfs"):
194 if self.fstype.startswith(prefix): 198 if self.fstype.startswith(prefix):
195 method = getattr(self, "prepare_rootfs_" + prefix) 199 method = getattr(self, "prepare_rootfs_" + prefix)