External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

logging: Don't inhibit shutdown in system daemon

Browse Source 
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 df34363d58.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1547250

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Martin Kletzander 2018-04-26 12:17:03 +02:00
parent 00b50292fd
commit f94e5b2157
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/logging/log_daemon.c
View File

@ -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