summaryrefslogtreecommitdiffstats
path: root/daemons
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2012-02-23 13:11:07 +0000
committerPetr Rockai <prockai@redhat.com>2012-02-23 13:11:07 +0000
commitdae0822698327e81f467c3594141d70cdafca331 (patch)
tree673c87128df8e56be79703a799c83d12acbe5b19 /daemons
parent182d1f60d2fb1bbadef2974fa55278f553b04ed9 (diff)
downloadlvm2-dae0822698327e81f467c3594141d70cdafca331.tar.gz
lvm2-dae0822698327e81f467c3594141d70cdafca331.tar.xz
lvm2-dae0822698327e81f467c3594141d70cdafca331.zip
The lvmetad client-side integration. Only active when use_lvmetad = 1 is set in
lvm.conf *and* lvmetad is running.
Diffstat (limited to 'daemons')
-rw-r--r--daemons/dmeventd/plugins/lvm2/Makefile.in2
-rw-r--r--daemons/dmeventd/plugins/mirror/Makefile.in2
-rw-r--r--daemons/dmeventd/plugins/snapshot/Makefile.in2
-rw-r--r--daemons/lvmetad/lvmetad-client.h3
4 files changed, 4 insertions, 5 deletions
diff --git a/daemons/dmeventd/plugins/lvm2/Makefile.in b/daemons/dmeventd/plugins/lvm2/Makefile.in
index 870a251d..77bc15cc 100644
--- a/daemons/dmeventd/plugins/lvm2/Makefile.in
+++ b/daemons/dmeventd/plugins/lvm2/Makefile.in
@@ -24,7 +24,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
-LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS)
+LIBS += @LVM2CMD_LIB@ -ldevmapper $(PTHREAD_LIBS) -L$(top_builddir)/daemons/common -ldaemon
install_lvm2: install_lib_shared
diff --git a/daemons/dmeventd/plugins/mirror/Makefile.in b/daemons/dmeventd/plugins/mirror/Makefile.in
index e87611a9..424c4859 100644
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -30,7 +30,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2 -ldevmapper
+LIBS += -ldevmapper-event-lvm2 -ldevmapper -L$(top_builddir)/daemons/common -ldaemon
install_lvm2: install_dm_plugin
diff --git a/daemons/dmeventd/plugins/snapshot/Makefile.in b/daemons/dmeventd/plugins/snapshot/Makefile.in
index d6716ba5..3d731e56 100644
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -26,7 +26,7 @@ LIB_VERSION = $(LIB_VERSION_LVM)
include $(top_builddir)/make.tmpl
-LIBS += -ldevmapper-event-lvm2 -ldevmapper
+LIBS += -ldevmapper-event-lvm2 -ldevmapper -L$(top_builddir)/daemons/common -ldaemon
install_lvm2: install_dm_plugin
diff --git a/daemons/lvmetad/lvmetad-client.h b/daemons/lvmetad/lvmetad-client.h
index 8182c7ad..a5b5d094 100644
--- a/daemons/lvmetad/lvmetad-client.h
+++ b/daemons/lvmetad/lvmetad-client.h
@@ -64,11 +64,10 @@ daemon_reply lvmetad_supersede_vg(daemon_handle h, struct volume_group *vg);
static inline daemon_handle lvmetad_open(const char *socket)
{
- /* TODO configurable */
daemon_info lvmetad_info = {
.path = "lvmetad",
.socket = socket ?: DEFAULT_RUN_DIR "/lvmetad.socket",
- .autostart = 1
+ .autostart = 0
};
return daemon_open(lvmetad_info);