Fail deamonization if lvmcache_init fail

FIXME Add proper cleanup

diff --git a/WHATS_NEW b/WHATS_NEW
index 562627c51385baeb25cb0cfe8b188c81c22e3727..3dc9141212167dd370a901c611967673c5bce866 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.80 - 
 ====================================
+  Fail poll daemon creation when lvmcache_init() fails.
   Return defined value for errors in _copy_percent() and _snap_percent().
   Correct return code of cmirrord when issuing 'start' when already running.
   Fix wrongly paired unlocking of global lock in pvchange. (2.02.66)

diff --git a/tools/polldaemon.c b/tools/polldaemon.c
index 50579baba7679ca7f9ba759a0fc936f51fcdae40..4da27fed701b2d9d68070a3d7c5c5549c22c6bfb 100644 (file)
--- a/tools/polldaemon.c
+++ b/tools/polldaemon.c
@@ -64,7 +64,9 @@ static int _become_daemon(struct cmd_context *cmd)
        strncpy(*cmd->argv, "(lvm2)", strlen(*cmd->argv));
 
        reset_locking();
-       lvmcache_init();
+       if (!lvmcache_init())
+               /* FIXME Clean up properly here */
+               _exit(ECMD_FAILED);
        dev_close_all();
 
        return 1;