wic imager is able to add entries for the partitions to fstab. This patch also
creates an entry for the root device, which was previously ignored. The root
device entry can now optionally be uuid or label based.
The stock fstab file provided by base-files.bb already contains an entry for the
root device. The result looks something like this:
/dev/root / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,ptmxmode=0666,gid=5 0 0
tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
tmpfs /var/volatile tmpfs defaults 0 0
UUID=055A-69B5 /boot vfat defaults 0 0
UUID=0eb2df23-3638-4bbf-b045-9a425cb45954 / ext4 defaults 0 0
To avoid duplicate root device entries in fstab for wic images, the "/dev/root"
line is removed during the update.
Signed-off-by: Markus Volk <f_...@t-online.de>
---
scripts/lib/wic/plugins/imager/direct.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/imager/direct.py
b/scripts/lib/wic/plugins/imager/direct.py
index da483daed5..fd86a094d9 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 part.mountpoint == "/" or not
part.mountpoint.startswith('/'):
+ or not part.mountpoint.startswith('/'):
continue
if part.use_uuid:
@@ -145,6 +145,11 @@ class DirectPlugin(ImagerPlugin):
fstab_lines.append(line)
updated = True
+ for line in fstab_lines:
+ if '/dev/root' in line:
+ fstab_lines.remove(line)
+ updated = True
+
if updated:
self.updated_fstab_path = os.path.join(self.workdir, "fstab")
with open(self.updated_fstab_path, "w") as f:
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171205):
https://lists.openembedded.org/g/openembedded-core/message/171205
Mute This Topic: https://lists.openembedded.org/mt/94010270/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
