From 3b4d998c7a699aef62e39e0f91d145125d0b068d Mon Sep 17 00:00:00 2001 From: Aleksandar Nikolic Date: Sun, 21 Jun 2026 15:25:19 -0500 Subject: [PATCH] wic: Fix updating fstab for nvme devices In case wks file references nvme, update_fstab() function will not add prefix 'p' before the partition number, as the if condition only takes mmcblk into consideration. In case of nvme0n1 this leads that following entries are added to fstab: /dev/nvme0n11 /dev/nvme0n13 instead of: /dev/nvme0n1p1 /dev/nvme0n1p3 The patch fixes this as it extends the if condition and adds prefix 'p' for both mmcblk and nvme. Upstream-Status: Backport [https://git.yoctoproject.org/wic/commit/?id=f20cda73b495b75ef399c331f59b0e2401a3e76a] (From OE-Core rev: 5dde0ae4c9592091935eca63beacd3af28ac508a) Signed-off-by: Aleksandar Nikolic Signed-off-by: Yoann Congal Signed-off-by: Paul Barker --- scripts/lib/wic/plugins/imager/direct.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index a1d152659b..b06e6a8f23 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -133,8 +133,8 @@ class DirectPlugin(ImagerPlugin): elif part.use_label: device_name = "LABEL=%s" % part.label else: - # mmc device partitions are named mmcblk0p1, mmcblk0p2.. - prefix = 'p' if part.disk.startswith('mmcblk') else '' + # mmc and nvme device partitions start with prefix 'p' + prefix = 'p' if part.disk.startswith(('mmcblk', 'nvme')) else '' device_name = "/dev/%s%s%d" % (part.disk, prefix, part.realnum) opts = part.fsopts if part.fsopts else "defaults" @@ -266,7 +266,7 @@ class DirectPlugin(ImagerPlugin): elif part.label and self.ptable_format != 'msdos': return "PARTLABEL=%s" % part.label else: - suffix = 'p' if part.disk.startswith('mmcblk') else '' + suffix = 'p' if part.disk.startswith(('mmcblk', 'nvme')) else '' return "/dev/%s%s%-d" % (part.disk, suffix, part.realnum) def cleanup(self):