diff options
author | Ross Burton <ross.burton@arm.com> | 2022-09-27 17:56:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-28 07:59:35 +0100 |
commit | 4a7b3ef0a69b7e08030519b712a6fe4dd199c571 (patch) | |
tree | 3f093be2199f9714882b6b765548bde371fd2efb /scripts | |
parent | ffddeb8e0cbbb13fa06e4273ac0522f1b21600e7 (diff) | |
download | openembedded-core-4a7b3ef0a69b7e08030519b712a6fe4dd199c571.tar.gz |
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 <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index c44159b235..da483daed5 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: |