From 622fb968a22d5b2c6ba3dcd9155743adfe5dec8c Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 10 Oct 2012 12:32:24 +0200 Subject: [PATCH] lvmetad: Fix the -f pidfile (non-)creation logic. --- daemons/lvmetad/lvmetad-core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index ff861a206..22625c5c6 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -1105,11 +1105,13 @@ int main(int argc, char *argv[]) } } - if (s.foreground && !_socket_override) { - fprintf(stderr, "A socket path (-s) is required in foreground mode."); - exit(2); - } else { - s.pidfile = NULL; + if (s.foreground) { + if (!_socket_override) { + fprintf(stderr, "A socket path (-s) is required in foreground mode."); + exit(2); + } else { + s.pidfile = NULL; + } } daemon_start(s); -- 2.43.5