|
 |
8977f8 |
From 3bcba789b9c5f776aa5f43b5783ef41befee62a6 Mon Sep 17 00:00:00 2001
|
|
|
8977f8 |
From: =?UTF-8?q?Jakub=20Jank=C5=AF?= <jjanku@redhat.com>
|
|
|
8977f8 |
Date: Fri, 20 Mar 2020 17:18:32 +0100
|
|
|
8977f8 |
Subject: [PATCH 2/4] vdagentd: init static uinput before fork
|
|
|
8977f8 |
MIME-Version: 1.0
|
|
|
8977f8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
8977f8 |
Content-Transfer-Encoding: 8bit
|
|
|
8977f8 |
|
|
|
8977f8 |
Otherwise the caller doesn't know that the init failed
|
|
|
8977f8 |
because we're returning 0 in the parent and 1 in child.
|
|
|
8977f8 |
|
|
|
8977f8 |
Signed-off-by: Jakub Janků <jjanku@redhat.com>
|
|
|
8977f8 |
Acked-by: Frediano Ziglio <fziglio@redhat.com>
|
|
|
8977f8 |
(cherry picked from commit 7b0435ef66af088c1a1be20b6bc6b0fcb76e4e1a)
|
|
|
8977f8 |
---
|
|
|
8977f8 |
src/vdagentd/vdagentd.c | 6 +++---
|
|
|
8977f8 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
8977f8 |
|
|
|
8977f8 |
diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
|
|
|
8977f8 |
index 1b63ec8..753c9bf 100644
|
|
|
8977f8 |
--- a/src/vdagentd/vdagentd.c
|
|
|
8977f8 |
+++ b/src/vdagentd/vdagentd.c
|
|
|
8977f8 |
@@ -1224,9 +1224,6 @@ int main(int argc, char *argv[])
|
|
|
8977f8 |
}
|
|
|
8977f8 |
}
|
|
|
8977f8 |
|
|
|
8977f8 |
- if (do_daemonize)
|
|
|
8977f8 |
- daemonize();
|
|
|
8977f8 |
-
|
|
|
8977f8 |
#ifdef WITH_STATIC_UINPUT
|
|
|
8977f8 |
uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0,
|
|
|
8977f8 |
debug > 1, uinput_fake);
|
|
|
8977f8 |
@@ -1236,6 +1233,9 @@ int main(int argc, char *argv[])
|
|
|
8977f8 |
}
|
|
|
8977f8 |
#endif
|
|
|
8977f8 |
|
|
|
8977f8 |
+ if (do_daemonize)
|
|
|
8977f8 |
+ daemonize();
|
|
|
8977f8 |
+
|
|
|
8977f8 |
g_unix_signal_add(SIGINT, signal_handler, NULL);
|
|
|
8977f8 |
g_unix_signal_add(SIGHUP, signal_handler, NULL);
|
|
|
8977f8 |
g_unix_signal_add(SIGTERM, signal_handler, NULL);
|
|
|
8977f8 |
--
|
|
|
8977f8 |
2.26.1
|
|
|
8977f8 |
|