]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs"
authorRoss Burton <ross.burton@arm.com>
Tue, 27 Sep 2022 16:56:27 +0000 (17:56 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 28 Sep 2022 06:59:35 +0000 (07:59 +0100)
commit4a7b3ef0a69b7e08030519b712a6fe4dd199c571
tree3f093be2199f9714882b6b765548bde371fd2efb
parentffddeb8e0cbbb13fa06e4273ac0522f1b21600e7
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>
scripts/lib/wic/plugins/imager/direct.py