From: Alexandre Belloni Date: Sun, 8 Feb 2015 23:16:24 +0000 (+0100) Subject: wic: remove useless calls to __write_fstab X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=89bb8b53f8b6b208419fec2d6fe39f440646936b;p=openembedded-core.git wic: remove useless calls to __write_fstab __write_fstab() is already iterating over parts. There is now need to call it fort each parts. Change-Id: I7cf315a6b25c30ffc24baf90402df3c9f5026058 Signed-off-by: Alexandre Belloni Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Otavio Salvador --- diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 38d4e78e62..c605e64238 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -136,7 +136,7 @@ class DirectImageCreator(BaseImageCreator): fstab_lines.append(fstab_entry) def _write_fstab(self, fstab, fstab_lines): - fstab = open(fstab, "w") + fstab = open(fstab + ".new", "w") for line in fstab_lines: fstab.write(line) fstab.close() @@ -258,12 +258,9 @@ class DirectImageCreator(BaseImageCreator): # self.assemble() calls Image.assemble() which calls # __write_partitition() for each partition to dd the fs # into the partitions. - fstab = self.__write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) - p.prepare(self, self.workdir, self.oe_builddir, self.rootfs_dir, self.bootimg_dir, self.kernel_dir, self.native_sysroot) - self._restore_fstab(fstab) self.__image.add_partition(int(p.size), p.disk, @@ -277,6 +274,9 @@ class DirectImageCreator(BaseImageCreator): no_table = p.no_table, part_type = p.part_type) + fstab = self.__write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) + self._restore_fstab(fstab) + self.__image.layout_partitions(self._ptable_format) self.__imgdir = self.workdir