[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3341/8267] wic: check that filesystem is specified for a rootfs partition

[Emmanuele Bassi <ebassi src gnome org>]

commit 294410cce3569fa4c29c2bbc300435303fee2050
Author: Maciej Borzecki <maciej borzecki rndity com>
Date:   Thu Nov 10 13:18:34 2016 +0100

    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)
    
    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>

 scripts/lib/wic/partition.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index f383533..ac4c836 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -190,6 +190,10 @@ class Partition():
         if os.path.isfile(rootfs):
             os.remove(rootfs)
 
+        if not self.fstype:
+            msger.error("File system for partition %s not specified in kickstart, " \
+                        "use --fstype option" % (self.mountpoint))
+
         for prefix in ("ext", "btrfs", "vfat", "squashfs"):
             if self.fstype.startswith(prefix):
                 method = getattr(self, "prepare_rootfs_" + prefix)