Re: [PATCH 4/4] wic: fix restoring of original fstab

Re: [PATCH 4/4] wic: fix restoring of original fstab

[Diego Rondini]

Hi Ed,

> 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]
> 
> Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>

I've applied the patch locally, and deliberately caused some WicError 
exceptions: the resulting fstab correctly has only one mount entry. So this 
seems to fix #11633.

Tested-by: Diego Rondini <diego.rondini@kynetics.com>

Thanks for taking care of this,
Diego

[PATCH 0/4] wic: fix for #11633 and code cleanup

[Ed Bartosh]

Hi,

This patchset contains a fix for long standing wic bug: in some cases wic
can leave updated fstab in a rootfs directory and produce duplicate fstab
entries.

A bit of code cleanup is also included into the patchset.

The following changes since commit 27917fa9e14c1f0b0c3ed20c504772cf7d07b9df:

  image.bbclass: use prependVarFlag for postfuncs (2017-06-16 15:11:22 +0300)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ed/wip
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip

Ed Bartosh (4):
  runner.py: move runtool API to misc.py
  wic: flatten directory structure
  wic: code cleanup
  wic: fix restoring of original fstab

 scripts/lib/wic/engine.py                          |  2 +-
 scripts/lib/wic/filemap.py                         |  8 +---
 scripts/lib/wic/{utils => }/misc.py                | 43 +++++++++++++++---
 scripts/lib/wic/partition.py                       |  3 +-
 scripts/lib/wic/pluginbase.py                      |  3 +-
 scripts/lib/wic/plugins/imager/direct.py           | 11 ++---
 scripts/lib/wic/plugins/source/bootimg-efi.py      |  4 +-
 .../lib/wic/plugins/source/bootimg-partition.py    |  2 +-
 scripts/lib/wic/plugins/source/bootimg-pcbios.py   |  5 +--
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |  2 +-
 scripts/lib/wic/plugins/source/rawcopy.py          |  2 +-
 scripts/lib/wic/plugins/source/rootfs.py           |  2 +-
 scripts/lib/wic/utils/__init__.py                  |  0
 scripts/lib/wic/utils/runner.py                    | 52 ----------------------
 scripts/wic                                        |  2 +-
 15 files changed, 58 insertions(+), 83 deletions(-)
 rename scripts/lib/wic/{utils => }/misc.py (86%)
 delete mode 100644 scripts/lib/wic/utils/__init__.py
 delete mode 100644 scripts/lib/wic/utils/runner.py

--
Regards,
Ed

[PATCH 4/4] wic: fix restoring of original fstab

[Ed Bartosh]

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]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/plugins/imager/direct.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index e09350b..e26defb 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -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()
-- 
2.1.4