activation: log target version present

[lvm2.git] / lib / activate / activate.c

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 1f2157318a3dc7a676222e936fb65fc77a283699..512adcf8c4d53338ec43f6b04449cd587c78dfe8 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -328,10 +328,8 @@ int activation(void)
        return _activation;
 }
 
-static int _passes_volumes_filter(struct cmd_context *cmd,
-                                 struct logical_volume *lv,
-                                 const struct dm_config_node *cn,
-                                 const char *config_path)
+static int _lv_passes_volumes_filter(struct cmd_context *cmd, struct logical_volume *lv,
+                                    const struct dm_config_node *cn, const char *config_path)
 {
        const struct dm_config_value *cv;
        const char *str;
@@ -429,7 +427,7 @@ static int _passes_activation_filter(struct cmd_context *cmd,
                return 0;
        }
 
-       return _passes_volumes_filter(cmd, lv, cn, "activation/volume_list");
+       return _lv_passes_volumes_filter(cmd, lv, cn, "activation/volume_list");
 }
 
 static int _passes_readonly_filter(struct cmd_context *cmd,
@@ -440,7 +438,21 @@ static int _passes_readonly_filter(struct cmd_context *cmd,
        if (!(cn = find_config_tree_node(cmd, "activation/read_only_volume_list")))
                return 0;
 
-       return _passes_volumes_filter(cmd, lv, cn, "activation/read_only_volume_list");
+       return _lv_passes_volumes_filter(cmd, lv, cn, "activation/read_only_volume_list");
+}
+
+
+int lv_passes_auto_activation_filter(struct cmd_context *cmd, struct logical_volume *lv)
+{
+       const struct dm_config_node *cn;
+
+       if (!(cn = find_config_tree_node(cmd, "activation/auto_activation_volume_list"))) {
+               log_verbose("activation/auto_activation_volume_list configuration setting "
+                           "not defined: All logical volumes will be auto-activated.");
+               return 1;
+       }
+
+       return _lv_passes_volumes_filter(cmd, lv, cn, "activation/auto_activation_volume_list");
 }
 
 int library_version(char *version, size_t size)
@@ -502,6 +514,11 @@ int target_version(const char *target_name, uint32_t *maj,
        } while (last_target != target);
 
       out:
+       if (r)
+               log_very_verbose("Found %s target "
+                                "v%" PRIu32 ".%" PRIu32 ".%" PRIu32 ".",
+                                target_name, *maj, *min, *patchlevel);
+
        dm_task_destroy(dmt);
 
        return r;