curtin-dev team mailing list archive

[Ryan Harper <rharper@xxxxxxxxxxx>]

Ryan Harper has proposed merging ~ryan-p-norwood/curtin:1925399 into curtin:master.

Commit message:
Fix NVMe validation for namespaces with UUID

NVMe namespaces are only verified if the wwn comes from either the
NGUID or EUI64. With NVMe 1.3 a third ID, UUID is now[1] supported for a
namespace. If it exists it takes precedence and the wwid in sysfs will
populate with that uuid and use a uuid.XXXXX format, which does not
validate correctly with the filter in curtin.

/sys/devices/virtual/nvme-subsystem/nvme-subsys0/nvme0/nvme0n1/wwid:uuid.289acd66-794d-439d-abd0-0396f6382936

1. https://lore.kernel.org/patchwork/patch/808637/


LP: #1925399


Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~ryan-p-norwood/curtin/+git/curtin/+merge/401624
-- 
Your team curtin developers is requested to review the proposed merge of ~ryan-p-norwood/curtin:1925399 into curtin:master.

diff --git a/curtin/block/schemas.py b/curtin/block/schemas.py
index 7e8e324..3923321 100644
--- a/curtin/block/schemas.py
+++ b/curtin/block/schemas.py
@@ -141,7 +141,7 @@ DISK = {
             'type': 'string',
             'oneOf': [
                 {'pattern': r'^0x(\d|[a-zA-Z])+'},
-                {'pattern': r'^(nvme|eui)\.([-0-9a-zA-Z])+'}],
+                {'pattern': r'^(nvme|eui|uuid)\.([-0-9a-zA-Z])+'}],
         },
         'grub_device': {
             'type': ['boolean', 'integer'],