diff mbox series

[scarthgap] wic: fix updating fstab for nvme0n1

Message ID 20260520192438.138210-1-aleksandar.nikolic22@pm.me
State New
Headers show
Series [scarthgap] wic: fix updating fstab for nvme0n1 | expand

Commit Message

Aleksandar Nikolic May 20, 2026, 7:24 p.m. UTC 
From: Aleksandar Nikolic <aleksandar.nikolic@zeiss.com>

In case wks file references nvme0n1, update_fstab() function creates wrong entries
in /etc/fstab, as it is not adding prefix 'p' before the partition number (at the
moment this happens only for mmcblk). This leads that entries in /etc/fstab start
with:

    /dev/nvme0n11
    /dev/nvme0n13

instead with:

    /dev/nvme0n1p1
    /dev/nvme0n1p3

The patch fixes this as it extends the if condition and adds prefix 'p' for
both mmcblk and nvme0n1.

Signed-off-by: Aleksandar Nikolic <aleksandar.nikolic@zeiss.com>
---
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Aleksandar Nikolic May 20, 2026, 7:27 p.m. UTC | #1 
If this gets accepted I'll send the same patch for whinlatter and in https://git.yoctoproject.org/wic/.
diff mbox series

Patch

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index a1d152659b..b2b407dc16 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -134,7 +134,7 @@  class DirectPlugin(ImagerPlugin):
                 device_name = "LABEL=%s" % part.label
             else:
                 # mmc device partitions are named mmcblk0p1, mmcblk0p2..
-                prefix = 'p' if  part.disk.startswith('mmcblk') else ''
+                prefix = 'p' if  part.disk.startswith('mmcblk') or part.disk.startswith('nvme0n1') else ''
                 device_name = "/dev/%s%s%d" % (part.disk, prefix, part.realnum)
 
             opts = part.fsopts if part.fsopts else "defaults"