[3/4] Revert "Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs""

Message ID 20240508143801.557383-4-amikan@ilbers.de
State Superseded, archived
Headers show
Series Update WIC to the latest revision | expand

Commit Message

Anton Mikanovich May 8, 2024, 2:38 p.m. UTC
Commit a4237f08 was reverted in oe-core, but still needs in Isar.
Revert it back until other implementation will be done.

This reverts commit 045e0da5ef147d3e9e0dc4ea8db95c0746984efa.
---
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Anton Mikanovich May 8, 2024, 2:46 p.m. UTC | #1
08/05/2024 17:38, Anton Mikanovich wrote:
> Commit a4237f08 was reverted in oe-core, but still needs in Isar.
> Revert it back until other implementation will be done.
>
> This reverts commit 045e0da5ef147d3e9e0dc4ea8db95c0746984efa.

I'm not sure about the correct way of handling '/' exclusion
re-introduced in a new WIC revision, so if anyone have an opinion
please feel free to share it.

Patch

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index a1d15265..33a869ec 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -117,7 +117,7 @@  class DirectPlugin(ImagerPlugin):
         updated = False
         for part in self.parts:
             if not part.realnum or not part.mountpoint \
-               or part.mountpoint == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"):
+               or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"):
                 continue
 
             if part.use_uuid: