vdo: fix preload of kvdo

Commit 5bf1dba9eb8a8b77410e386e59dadeb27801b14e broke load of kvdo
kernel module - correct it by loading kvdo instead of trying dm-vdo.

diff --git a/WHATS_NEW b/WHATS_NEW
index 4b5b230726643df5c08b7cf53f0129b4c6f2079a..04c6dcdf26bd96bb5518db51c3ea0af9d0c985d6 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.03.13 - 
 ===============================
+  Fix load of kvdo target when it is not present in memory (2.03.12).
 
 Version 2.03.12 - 07th May 2021
 ===============================

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 71db981915068d3c1bb318a4547fa22d38e2e9d7..6bda7385ba5c0d9ddfd70909cbf159ff081407ed 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -574,13 +574,9 @@ int module_present(struct cmd_context *cmd, const char *target_name)
        }
 
 #ifdef MODPROBE_CMD
-       if (strcmp(target_name, MODULE_NAME_VDO) == 0) {
-               argv[1] = target_name;          /* ATM kvdo is without dm- prefix */
-               if ((ret = exec_cmd(cmd, argv, NULL, 0)))
-                       return ret;
-       }
-
-       if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) {
+       if (strcmp(target_name, TARGET_NAME_VDO) == 0)
+               argv[1] = MODULE_NAME_VDO; /* ATM kvdo is without dm- prefix */
+       else if (dm_snprintf(module, sizeof(module), "dm-%s", target_name) < 0) {
                log_error("module_present module name too long: %s",
                          target_name);
                return 0;