From: Ross Burton Date: Tue, 27 Sep 2022 16:56:27 +0000 (+0100) Subject: Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs" X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2862 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a7b3ef0a69b7e08030519b712a6fe4dd199c571;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs" Commit 20d43a2 allows changes in fstab for the / mount. However, if the fstab contains / already then this results in two entries for / in the fstab, which is confusing and results in systemd producing errors on boot: systemd-fstab-generator[11101]: Failed to create unit file /run/systemd/generator/-.mount, as it already exists. Duplicate entry in /etc/fstab? Wic should be extended to support merging mount points in fstab, but as we're about to release revert the patch that introduced this change as it hasn't been in a release yet, and the issue which prompted the patch in the first place can be revisited post-release. [ YOCTO #14865 ] Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index c44159b2357..da483daed5f 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 not part.mountpoint.startswith('/'): + or part.mountpoint == "/" or not part.mountpoint.startswith('/'): continue if part.use_uuid: