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


Felix Moessbauer
 

This re-introduces commit 20d43a2, which was reverted because it led to
duplicated entries in the fstab (from the rootfs and WIC). As the
deduplication logic is now added to WIC, the commit can be introduced
again.

By that, the / mountpoint can be defined using WIC scripts.

Reviewed-by: Florian Bezdeka <florian.bezdeka@...>
Signed-off-by: Felix Moessbauer <felix.moessbauer@...>
---
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 085bf8b463..ae871e8795 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -125,7 +125,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:
--
2.34.1