From f94e5b215720c91c60219f1694783a603f0b619c Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Thu, 26 Apr 2018 12:17:03 +0200 Subject: [PATCH] logging: Don't inhibit shutdown in system daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That is a job of libvirtd and virtlogd has a dependency on it, so that will prevent it properly. Doing it one extra time in virtlogd might also cause AVC denials because it is not allowed to call that dbus method. Caused by commit df34363d58bb. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1547250 Signed-off-by: Martin Kletzander Reviewed-by: Daniel P. Berrangé --- src/logging/log_daemon.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 35d7ebb6d2..91bd9d0b90 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -128,6 +128,12 @@ virLogDaemonInhibitor(bool inhibit, void *opaque) { virLogDaemonPtr dmn = opaque; + /* virtlogd uses inhibition only to stop session daemon being killed after + * the specified timeout, for the system daemon this is taken care of by + * libvirtd and the dependencies between the services. */ + if (virNetDaemonIsPrivileged(dmn->dmn)) + return; + if (inhibit) virNetDaemonAddShutdownInhibition(dmn->dmn); else