mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: fix restoring of original fstab

Browse Source 
Wic updates fstab if mount points are specified in .wks.
After partition images are created the original fstab is restored.
However, if exception is raised when partition image being prepared
wic doesn't restore original fstab. This can cause duplication of
added lines in fstab when 'wic create' runs next time.

Wrapping call of 'prepare' method and restoring original fstab
even if exception occurs should fix this.

[YOCTO #11633]

(From OE-Core rev: 29f7735030d383f9614bdb148b52a47c79f05eea)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-06-16 16:19:30 +03:00
committed by Richard Purdie
parent 247b7a8c3a
commit 44023e6c41
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/lib/wic/plugins/imager/direct.py
View File

@@ -172,10 +172,11 @@ class DirectPlugin(ImagerPlugin):
if rsize_bb:
part.size = int(round(float(rsize_bb)))
self._image.prepare(self)
if fstab_path:
shutil.move(fstab_path + ".orig", fstab_path)
try:
self._image.prepare(self)
finally:
if fstab_path:
shutil.move(fstab_path + ".orig", fstab_path)
self._image.layout_partitions()
self._image.create()