Merge branch '3.9-devel' into 3.10-devel

blivet/populator/helpers/disk.py

@@ -27,6 +27,8 @@
 from gi.repository import BlockDev as blockdev
 from gi.repository import GLib
 
+import uuid
+
 from ... import udev
 from ... import util
 from ...devices import DASDDevice, DiskDevice, FcoeDiskDevice, iScsiDiskDevice
@@ -257,10 +259,14 @@ def _get_kwargs(self):
             log.debug("Failed to get namespace info for %s: %s", path, str(err))
         else:
             kwargs["nsid"] = ninfo.nsid
-            kwargs["uuid"] = ninfo.uuid
             kwargs["eui64"] = ninfo.eui64
             kwargs["nguid"] = ninfo.nguid
 
+            if ninfo.uuid and ninfo.uuid != uuid.UUID(int=0):
+                kwargs["uuid"] = ninfo.uuid
+            else:
+                kwargs["uuid"] = None
+
         log.info("%s is an NVMe local namespace device", udev.device_get_name(self.data))
         return kwargs