From: Łukasz Stelmach <l.stelmach@samsung.com>
Date: Thu, 14 Nov 2013 14:13:58 +0000 (+0100)
Subject: Check for installerfw fstab plugin in BaseImageCreator
X-Git-Tag: 0.23~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3d7b52889da4f12cff238af22c341d470798ec2;p=tools%2Fmic.git

Check for installerfw fstab plugin in BaseImageCreator

Change-Id: I3d2bb9cbcf93f5c3a1974205ee70123b6319f882
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---

diff --git a/mic/imager/baseimager.py b/mic/imager/baseimager.py
index 59aaf5b..781e0b8 100644
--- a/mic/imager/baseimager.py
+++ b/mic/imager/baseimager.py
@@ -691,6 +691,10 @@ class BaseImageCreator(object):
             raise CreatorError("No repositories specified")
 
     def __write_fstab(self):
+        if kickstart.use_installerfw(self.ks, "fstab"):
+            # The fstab file will be generated by installer framework scripts
+            # instead.
+            return None
         fstab_contents = self._get_fstab()
         if fstab_contents:
             fstab = open(self._instroot + "/etc/fstab", "w")
diff --git a/mic/imager/raw.py b/mic/imager/raw.py
index 40a4ac7..a849a56 100644
--- a/mic/imager/raw.py
+++ b/mic/imager/raw.py
@@ -77,11 +77,6 @@ class RawImageCreator(BaseImageCreator):
         BaseImageCreator.configure(self, repodata)
 
     def _get_fstab(self):
-        if kickstart.use_installerfw(self.ks, "fstab"):
-            # The fstab file will be generated by installer framework scripts
-            # instead.
-            return None
-
         s = ""
         for mp in self.__instloop.mountOrder:
             p = None