[PATCH] wic/DirectPlugin: don't update fstab if --no-fstab-update

[PATCH] wic/DirectPlugin: don't update fstab if --no-fstab-update

[joerg.sommer]

From: Jörg Sommer <joerg.sommer@navimatix.de>

The function `update_fstab` should not touch the fstab for partitions with
`--no-fstab-update`.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 9b619e41c1..013aa4255f 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -116,7 +116,7 @@ class DirectPlugin(ImagerPlugin):
 
         updated = False
         for part in self.parts:
-            if not part.realnum or not part.mountpoint \
+            if not part.realnum or not part.mountpoint or part.no_fstab_update \
                or part.mountpoint == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"):
                 continue
 
-- 
2.34.1

Re: [OE-core] [PATCH] wic/DirectPlugin: don't update fstab if --no-fstab-update

[Alexandre Belloni]

Hello,

This causes the following failure:

2023-12-07 02:54:18,682 - oe-selftest - INFO - ======================================================================
2023-12-07 02:54:18,682 - oe-selftest - INFO - FAIL: wic.Wic.test_no_fstab_update (subunit.RemotedTestCase)
2023-12-07 02:54:18,682 - oe-selftest - INFO - ----------------------------------------------------------------------
2023-12-07 02:54:18,682 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/wic.py", line 768, in test_no_fstab_update
    self.assertNotEqual(bf_fstab_md5sum, part_fstab_md5sum[0])
  File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/buildtools/sysroots/x86_64-pokysdk-linux/usr/lib/python3.11/unittest/case.py", line 882, in assertNotEqual
    raise self.failureException(msg)
AssertionError: 'af3c087d6c9131735c8d1f270a226892' == 'af3c087d6c9131735c8d1f270a226892'

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/6151/steps/15/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6166/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/2551/steps/15/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/6156/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/6101/steps/14/logs/stdio


On 06/12/2023 19:33:02+0100, J�rg Sommer via lists.openembedded.org wrote:
> From: J�rg Sommer <joerg.sommer@navimatix.de>
> 
> The function `update_fstab` should not touch the fstab for partitions with
> `--no-fstab-update`.
> 
> Signed-off-by: J�rg Sommer <joerg.sommer@navimatix.de>
> ---
>  scripts/lib/wic/plugins/imager/direct.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
> index 9b619e41c1..013aa4255f 100644
> --- a/scripts/lib/wic/plugins/imager/direct.py
> +++ b/scripts/lib/wic/plugins/imager/direct.py
> @@ -116,7 +116,7 @@ class DirectPlugin(ImagerPlugin):
>  
>          updated = False
>          for part in self.parts:
> -            if not part.realnum or not part.mountpoint \
> +            if not part.realnum or not part.mountpoint or part.no_fstab_update \
>                 or part.mountpoint == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"):
>                  continue
>  
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#191906): https://lists.openembedded.org/g/openembedded-core/message/191906
> Mute This Topic: https://lists.openembedded.org/mt/103018986/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com