From ffe48b8e8a6c6dc7f55688dc268025e00456bc15 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Mon, 21 Jun 2021 18:35:42 +0200 Subject: [PATCH] systemd: allow SendSIGKILL and TimeoutStopUSec dbus properties Used in qemu-server for avoiding KillMode 'none'. SendSIGKILL is a boolean, so we need to use dbus_boolean to serialize it. Signed-off-by: Stefan Reiter --- src/PVE/Systemd.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PVE/Systemd.pm b/src/PVE/Systemd.pm index e9712e0..2517d31 100644 --- a/src/PVE/Systemd.pm +++ b/src/PVE/Systemd.pm @@ -3,7 +3,7 @@ package PVE::Systemd; use strict; use warnings; -use Net::DBus qw(dbus_uint32 dbus_uint64); +use Net::DBus qw(dbus_uint32 dbus_uint64 dbus_boolean); use Net::DBus::Callback; use Net::DBus::Reactor; @@ -107,7 +107,9 @@ sub enter_systemd_scope { foreach my $key (keys %extra) { if ($key eq 'Slice' || $key eq 'KillMode') { push @{$properties}, [$key, $extra{$key}]; - } elsif ($key eq 'CPUShares' || $key eq 'CPUWeight') { + } elsif ($key eq 'SendSIGKILL') { + push @{$properties}, [$key, dbus_boolean($extra{$key})]; + } elsif ($key eq 'CPUShares' || $key eq 'CPUWeight' || $key eq 'TimeoutStopUSec') { push @{$properties}, [$key, dbus_uint64($extra{$key})]; } elsif ($key eq 'CPUQuota') { push @{$properties}, ['CPUQuotaPerSecUSec', -- 2.39.2