From 21af89a6d44ccea6aef975ffd2483a8fad1231de Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 30 Mar 2017 13:37:15 +0300 Subject: wic: allow only supported fstypes Restricted possible values of --fstype to the list of supported types. This should catch incorrect values when .wks file is being parsed. Removed checks for empty fstype and mentioning of unsupported fstype 'ontrackdm6aux3'. Signed-off-by: Ed Bartosh --- scripts/lib/wic/partition.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'scripts/lib/wic/partition.py') diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 647a6fb3a7..f0e88fb4e8 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -136,11 +136,11 @@ class Partition(): "specify a non-zero --size/--fixed-size for that " "partition." % self.mountpoint) - if self.fstype and self.fstype == "swap": + if self.fstype == "swap": self.prepare_swap_partition(cr_workdir, oe_builddir, native_sysroot) self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype) - elif self.fstype: + else: rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, self.lineno, self.fstype) if os.path.isfile(rootfs): @@ -217,10 +217,6 @@ class Partition(): if os.path.isfile(rootfs): os.remove(rootfs) - if not self.fstype: - raise WicError("File system for partition %s not specified in " - "kickstart, use --fstype option" % self.mountpoint) - # Get rootfs size from bitbake variable if it's not set in .ks file if not self.size: # Bitbake variable ROOTFS_SIZE is calculated in -- cgit 1.2.3-korg