Add config file setting: dmeventd/mirror_library

diff --git a/doc/example.conf b/doc/example.conf
index c44c6a7a090370c8f2006345f03a9adeafd2e05c..425cc3ea0ff75c834c08af80413a9b0b02057d0d 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -289,4 +289,9 @@ activation {
     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
 #}
 
+# Event daemon
+#
+#dmeventd {
+    # mirror_library = "libdevmapper-event-lvm2mirror.so"
+#}
 

diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index aa6c470111884be931d7c5e0af844b78977648ad..e47e08b878434dc5735ebbe095569af843d70141 100644 (file)
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -34,6 +34,8 @@
 #define DEFAULT_LOCK_DIR "/var/lock/lvm"
 #define DEFAULT_LOCKING_LIB "lvm2_locking.so"
 
+#define DEFAULT_DMEVENTD_MIRROR_LIB "libdevmapper-event-lvm2mirror.so"
+
 #define DEFAULT_UMASK 0077
 
 #ifdef LVM1_FALLBACK

diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index 1e7ee09deb215aa2c2190fb2ed7ceb8705a533e2..4670cff42c8f4aef2e8b845da3593584f3e10059 100644 (file)
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -357,11 +357,8 @@ static int _setup_registration(struct dm_pool *mem, struct config_tree *cft,
                               char **dso)
 {
        /* FIXME Follow lvm2 searching rules (see sharedlib.c) */
-       /* FIXME Use naming convention in config file */
-       if (!(*dso = find_config_str(cft->root, "global/mirror_dso", NULL))) {
-               log_error("No mirror dso specified in config file");    /* FIXME readability */
-               return 0;
-       }
+       *dso = find_config_str(cft->root, "dmeventd/mirror_library",
+                              DEFAULT_DMEVENTD_MIRROR_LIB);
 
        return 1;
 }
@@ -390,7 +387,7 @@ static int _target_register_events(struct dm_pool *mem,
        strncpy(dm_name, build_dm_name(mem, vg->name, lv->name, NULL),
                PATH_MAX);
 
-       if((err = dm_event_register(dso, dm_name, DM_EVENT_ALL_ERRORS)) < 0) {
+       if ((err = dm_event_register(dso, dm_name, DM_EVENT_ALL_ERRORS)) < 0) {
                log_error("Unable to register %s for events: %s", dm_name,
                          strerror(-err));
                return 0;