]> sourceware.org Git - lvm2.git/commitdiff
Building without the '--enable-cmirrord' option means that
authorJonathan Earl Brassow <jbrassow@redhat.com>
Wed, 21 Jul 2010 15:21:24 +0000 (15:21 +0000)
committerJonathan Earl Brassow <jbrassow@redhat.com>
Wed, 21 Jul 2010 15:21:24 +0000 (15:21 +0000)
CMIRRORD_PIDFILE is not defined.  This makes the build fail.
Therefore, we need to conditionalize the check for cmirrord
based on if CMIRRORD_PIDFILE is defined.

lib/mirror/mirrored.c

index 7ee9e7b2a07ed7fe1da57ec8d669a98ae23acb14..7fe0a2b4ce79bb4fda45fdede6b5e72523d0e08c 100644 (file)
@@ -528,10 +528,15 @@ static int _mirrored_target_present(struct cmd_context *cmd,
                          * otherwise, the kernel module will fail to make
                          * contact.
                          */
+#ifdef CMIRRORD_PIDFILE
                         if (!dm_daemon_is_running(CMIRRORD_PIDFILE)) {
                                 log_verbose("Cluster mirror log daemon is not running");
                                 _mirror_attributes &= ~MIRROR_LOG_CLUSTERED;
                         }
+#else
+                       log_verbose("Cluster mirror log daemon not included in build");
+                       _mirror_attributes &= ~MIRROR_LOG_CLUSTERED;
+#endif
                }
                *attributes = _mirror_attributes;
        }
This page took 0.039523 seconds and 5 git commands to generate.