From: Michal Privoznik <mpriv...@redhat.com>
Let's write pidfile even if user did not request --daemon but
they requested just --pidfile. Libvirt will use exactly this.
Signed-off-by: Michal Privoznik <mpriv...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
scsi/qemu-pr-helper.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index eeff80a..d0f8317 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -924,6 +924,7 @@ int main(int argc, char **argv)
Error *local_err = NULL;
char *trace_file = NULL;
bool daemonize = false;
+ bool pidfile_specified = false;
unsigned socket_activation;
struct sigaction sa_sigterm;
@@ -954,6 +955,7 @@ int main(int argc, char **argv)
case 'f':
g_free(pidfile);
pidfile = g_strdup(optarg);
+ pidfile_specified = true;
break;
#ifdef CONFIG_LIBCAP
case 'u': {
@@ -1086,9 +1088,11 @@ int main(int argc, char **argv)
error_report("Failed to daemonize: %s", strerror(errno));
exit(EXIT_FAILURE);
}
- write_pidfile();
}
+ if (daemonize || pidfile_specified)
+ write_pidfile();
+
#ifdef CONFIG_LIBCAP
if (drop_privileges() < 0) {
error_report("Failed to drop privileges: %s", strerror(errno));
--
1.8.3.1
