wic: fix fstab generation
Commit 0a6668f6e60b4195ff4163c00fc972bacdb27b4b still included some debug and is not working properly as the new fstab is generated too late. (From OE-Core rev: eea80d25c0902bb16ed3425888857d3cc5486376) Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5cfac6b9e9
commit
0393438b94
|
@ -136,7 +136,7 @@ class DirectImageCreator(BaseImageCreator):
|
|||
fstab_lines.append(fstab_entry)
|
||||
|
||||
def _write_fstab(self, fstab, fstab_lines):
|
||||
fstab = open(fstab + ".new", "w")
|
||||
fstab = open(fstab, "w")
|
||||
for line in fstab_lines:
|
||||
fstab.write(line)
|
||||
fstab.close()
|
||||
|
@ -250,6 +250,8 @@ class DirectImageCreator(BaseImageCreator):
|
|||
if not self.ks.handler.bootloader.source and p.mountpoint == "/boot":
|
||||
self.ks.handler.bootloader.source = p.source
|
||||
|
||||
fstab = self.__write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
|
||||
|
||||
for p in parts:
|
||||
# need to create the filesystems in order to get their
|
||||
# sizes before we can add them and do the layout.
|
||||
|
@ -274,7 +276,6 @@ 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)
|
||||
|
|
Loading…
Reference in New Issue