Message ID | 20221109-wic-fstab-v1-0-e5523e743985@theobroma-systems.com |
---|---|
State | New |
Headers | show |
Series | [meta-rockchip,master,kirkstone,honister] rockchip.wic.inc: let wic update fstab again | expand |
On Wed 2022-11-09 @ 02:24:05 PM, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > The commit ed3a97f7b2e4 ("rockchip-wic.inc: don't let wic edit fstab") > removing this ability was introduced to fix an issue in the wic tool in > OE-Core in which wic partitions whose "mountpoint" is not a valid path > are still added to fstab. > This was eventually fixed in OE-Core in commit 7aa678ce804c > ("wic:direct.py: ignore invalid mountpoints during fstab update") which > is part of release Honister (3.4) and later. > > Therefore, it should be safe to now let wic update fstab again for > partitions with a valid mountpoint path. The benefit being that the wic > partitions with a mountpoint are now automounted at boot. > > Cc: Quentin Schulz <foss+yocto@0leil.net> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> > --- > restore fstab update by wic > > Since wic now correctly handles partitions without a valid mountpoint path and > does not add them to fstab, we can let wic update fstab again so let's do it. > > This makes partition automounting work again. > > This was tested on a Kirkstone (4.0.4) poky-based core-image-minimal on a > PX30-uQ7 (Ringneck) SoM on Haikou devkit > (https://git.theobroma-systems.com/yocto-layers/meta-theobroma-systems-bsp.git/) > > This should be safe to backport to kirkstone and honister too. > > Cc: Markus Volk <f_l_k@t-online.de> > Cc: Trevor Woerner <twoerner@gmail.com> > --- > conf/machine/include/rockchip-wic.inc | 3 --- > 1 file changed, 3 deletions(-) Applied to meta-rockchip master, kirkstone, and honister. Thanks!
diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index 6fa5367..635288c 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -27,6 +27,3 @@ WICVARS:append = " \ SPL_BINARY \ UBOOT_SUFFIX \ " - -# Do not update fstab file while creating wic images -WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"