summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-03-01 13:54:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-10 10:47:41 +0000
commit0393438b94e5ef88d911029c54576314d38a62b2 (patch)
treea6e97c01e83f004518f188dce4b57a3e9c6496ea /scripts/lib/wic
parent5cfac6b9e9eff0a9fbc4f4e595d688c1be083381 (diff)
downloadpoky-0393438b94e5ef88d911029c54576314d38a62b2.tar.gz
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>
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r--scripts/lib/wic/imager/direct.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index c605e64238..d368401af4 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -136,7 +136,7 @@ class DirectImageCreator(BaseImageCreator):
136 fstab_lines.append(fstab_entry) 136 fstab_lines.append(fstab_entry)
137 137
138 def _write_fstab(self, fstab, fstab_lines): 138 def _write_fstab(self, fstab, fstab_lines):
139 fstab = open(fstab + ".new", "w") 139 fstab = open(fstab, "w")
140 for line in fstab_lines: 140 for line in fstab_lines:
141 fstab.write(line) 141 fstab.write(line)
142 fstab.close() 142 fstab.close()
@@ -250,6 +250,8 @@ class DirectImageCreator(BaseImageCreator):
250 if not self.ks.handler.bootloader.source and p.mountpoint == "/boot": 250 if not self.ks.handler.bootloader.source and p.mountpoint == "/boot":
251 self.ks.handler.bootloader.source = p.source 251 self.ks.handler.bootloader.source = p.source
252 252
253 fstab = self.__write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
254
253 for p in parts: 255 for p in parts:
254 # need to create the filesystems in order to get their 256 # need to create the filesystems in order to get their
255 # sizes before we can add them and do the layout. 257 # sizes before we can add them and do the layout.
@@ -274,7 +276,6 @@ class DirectImageCreator(BaseImageCreator):
274 no_table = p.no_table, 276 no_table = p.no_table,
275 part_type = p.part_type) 277 part_type = p.part_type)
276 278
277 fstab = self.__write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
278 self._restore_fstab(fstab) 279 self._restore_fstab(fstab)
279 280
280 self.__image.layout_partitions(self._ptable_format) 281 self.__image.layout_partitions(self._ptable_format)