From d3d7b52889da4f12cff238af22c341d470798ec2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Thu, 14 Nov 2013 15:13:58 +0100 Subject: [PATCH] Check for installerfw fstab plugin in BaseImageCreator MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I3d2bb9cbcf93f5c3a1974205ee70123b6319f882 Signed-off-by: Łukasz Stelmach --- mic/imager/baseimager.py | 4 ++++ mic/imager/raw.py | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) 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 -- 2.7.4