devices: crypto skip

Devices with UUID signature CRYPT-SUBDEV are internal crypto devices.

diff --git a/WHATS_NEW b/WHATS_NEW
index 518b9443e7b8c27c78a67a32e81150cb937eb8a7..37ce33b246dc3fb9a8949bad9229050d8d1f4bd4 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.03.06 - 
 ================================
+  Ignore crypto devices with UUID signature CRYPT-SUBDEV.
   Enhance validation for thin and cache pool conversion and swapping.
   Improve internal removal of cached devices.
   Synchronize with udev when dropping snapshot.

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 3a6f11f7ace19bc185074822c3477786836d67fa..c780deaa02c99599cdb3693738f5b5a5abc36329 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -33,6 +33,7 @@
 #define MAX_TARGET_PARAMSIZE 50000
 #define LVM_UDEV_NOSCAN_FLAG DM_SUBSYSTEM_UDEV_FLAG0
 #define CRYPT_TEMP     "CRYPT-TEMP"
+#define CRYPT_SUBDEV   "CRYPT-SUBDEV"
 #define STRATIS                "stratis-"
 
 typedef enum {
@@ -658,6 +659,7 @@ int device_is_usable(struct device *dev, struct dev_usable_check_params check)
 
        if (check.check_reserved && uuid &&
            (!strncmp(uuid, CRYPT_TEMP, sizeof(CRYPT_TEMP) - 1) ||
+            !strncmp(uuid, CRYPT_SUBDEV, sizeof(CRYPT_SUBDEV) - 1) ||
             !strncmp(uuid, STRATIS, sizeof(STRATIS) - 1))) {
                /* Skip private crypto devices */
                log_debug_activation("%s: Reserved uuid %s on %s device %s not usable.",