From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sat, 21 Jan 2023 17:22:21 +0000 (-0500)
Subject: Prevent WIC from adding duplicated fstab entries
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=e47afff2997ff8b94277f385c68d396bffd6db44;p=yocto%2Fmeta-hvmpd.git

Prevent WIC from adding duplicated fstab entries
---

diff --git a/conf/distro/hvmpd.conf b/conf/distro/hvmpd.conf
index a155ac1..e4902d2 100644
--- a/conf/distro/hvmpd.conf
+++ b/conf/distro/hvmpd.conf
@@ -30,3 +30,12 @@ DEFAULT_TIMEZONE = "America/New_York"
 # The current locale can be set in /etc/locale.conf.
 # List of locales to install in all images:
 IMAGE_LINGUAS = "en-us en-ca"
+
+# Prevent WIC from adding duplicated fstab entries, since we are manually adding
+# our own fstab entries. The reason we need to manually add fstab entries is so
+# that the swupdate and WIC images have an identical /etc/fstab file.
+# Without this option, the WIC command would add entries to fstab but only
+# AFTER the rootfs image is generated, and the swupdate image is generated from
+# the rootfs image, and not the WIC image, which would lead to differences
+# between the two images.
+WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"