From nobody Thu May 16 09:15:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847709; cv=none; d=zohomail.com; s=zohoarc; b=CKI97+XSkvj6CqXHGCo87IJqqDcGQEUWrTVyYhwMJ0udSDC2DYAYlLYBDyfiX6k1fd2VA0s+Ht9NiqeCZnOYmjHvpk+SRXkFLt8AuB7L7rpND11+/Ca4AZYSf64HPm2X4aZ9xDCJWY3P8iHBjzWb7jzv89GuBDeEohfU0O1iyho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847709; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4SqHqNkfNvb8KVhuBf4ZUMcfFZAwdoRnncjmzqp1EUc=; b=CvH/OSrwr1kIMxxD5JkqV0yrIhWnC583jfMCxghAJ0BSjeuE6orDOS6QIG6PwWKO0JoWIt+h2gDWtUWljzQLFRjqd2M17F6Tl5iWWVwhV5dUeeN3BNi8NhV+KCJsCHRPpz5YMeaYpWkZj8AWTrm5HAnPTnJxr0sq0w2wOlEed6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585847709862347.2022106991383; Thu, 2 Apr 2020 10:15:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-ePGKjBq6OoqFbNGSa_mArg-1; Thu, 02 Apr 2020 13:15:05 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA847100FB2D; Thu, 2 Apr 2020 17:14:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E8B0A63C7; Thu, 2 Apr 2020 17:14:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A4578180887A; Thu, 2 Apr 2020 17:14:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEcx5011674 for ; Thu, 2 Apr 2020 13:14:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 091321001B2D; Thu, 2 Apr 2020 17:14:38 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02B341001B28 for ; Thu, 2 Apr 2020 17:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847708; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4SqHqNkfNvb8KVhuBf4ZUMcfFZAwdoRnncjmzqp1EUc=; b=YlKlzSWp/+DgA9Z7orRjEZCGJVsj2aEU46vB7PGnJQANIkDOqfmvbgoMRviSPO0+aLJgoV UybiZShZItzExFhqjnCZKTSPJB4+u/ro7MYez2NJgbQMmD3psHYWFk9uV9Q7FGq9tNJGUO 4htYnl9LVeR9Ylvawh7iPqjx4DePNjg= X-MC-Unique: ePGKjBq6OoqFbNGSa_mArg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/6] daemons: Support --timeout 0 Date: Thu, 2 Apr 2020 19:14:26 +0200 Message-Id: <20200402171431.677434-2-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When using systemd we want to take advantage of socket activation instead of keeping daemons running all the time, so we default to shutting them down after two minutes of inactivity. At the same time, we want it to be possible for the admin to opt out of this behavior and disable timeouts entirely. A very natural way to do so would be to specify a zero-length timeout, but that's currently not accepted by the command line parser. Address that. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/lock_daemon.c | 6 +++--- src/logging/log_daemon.c | 6 +++--- src/remote/remote_daemon.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 3d33995beb..4eff63014a 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -872,7 +872,7 @@ int main(int argc, char **argv) { int pid_file_fd =3D -1; char *sock_file =3D NULL; char *admin_sock_file =3D NULL; - int timeout =3D -1; /* -t: Shutdown timeout */ + int timeout =3D 0; /* -t: Shutdown timeout */ char *state_file =3D NULL; bool implicit_conf =3D false; mode_t old_umask; @@ -922,7 +922,7 @@ int main(int argc, char **argv) { =20 case 't': if (virStrToLong_i(optarg, &tmp, 10, &timeout) !=3D 0 - || timeout <=3D 0 + || timeout < 0 /* Ensure that we can multiply by 1000 without overflowing= . */ || timeout > INT_MAX / 1000) { VIR_ERROR(_("Invalid value for timeout")); @@ -1123,7 +1123,7 @@ int main(int argc, char **argv) { adminSrv =3D virNetDaemonGetServer(lockDaemon->dmn, "admin"); } =20 - if (timeout !=3D -1) { + if (timeout > 0) { VIR_DEBUG("Registering shutdown timeout %d", timeout); virNetDaemonAutoShutdown(lockDaemon->dmn, timeout); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index dcafcda926..f37054706e 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -653,7 +653,7 @@ int main(int argc, char **argv) { int pid_file_fd =3D -1; char *sock_file =3D NULL; char *admin_sock_file =3D NULL; - int timeout =3D -1; /* -t: Shutdown timeout */ + int timeout =3D 0; /* -t: Shutdown timeout */ char *state_file =3D NULL; bool implicit_conf =3D false; mode_t old_umask; @@ -703,7 +703,7 @@ int main(int argc, char **argv) { =20 case 't': if (virStrToLong_i(optarg, &tmp, 10, &timeout) !=3D 0 - || timeout <=3D 0 + || timeout < 0 /* Ensure that we can multiply by 1000 without overflowing= . */ || timeout > INT_MAX / 1000) { VIR_ERROR(_("Invalid value for timeout")); @@ -905,7 +905,7 @@ int main(int argc, char **argv) { adminSrv =3D virNetDaemonGetServer(logDaemon->dmn, "admin"); } =20 - if (timeout !=3D -1) { + if (timeout > 0) { VIR_DEBUG("Registering shutdown timeout %d", timeout); virNetDaemonAutoShutdown(logDaemon->dmn, timeout); diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index a1552800e9..7eec599177 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -770,7 +770,7 @@ int main(int argc, char **argv) { char *sock_file =3D NULL; char *sock_file_ro =3D NULL; char *sock_file_adm =3D NULL; - int timeout =3D -1; /* -t: Shutdown timeout */ + int timeout =3D 0; /* -t: Shutdown timeout */ int verbose =3D 0; int godaemon =3D 0; #ifdef WITH_IP @@ -844,7 +844,7 @@ int main(int argc, char **argv) { =20 case 't': if (virStrToLong_i(optarg, &tmp, 10, &timeout) !=3D 0 - || timeout <=3D 0 + || timeout < 0 /* Ensure that we can multiply by 1000 without overflowing= . */ || timeout > INT_MAX / 1000) { VIR_ERROR(_("Invalid value for timeout")); @@ -1107,7 +1107,7 @@ int main(int argc, char **argv) { goto cleanup; } =20 - if (timeout !=3D -1) { + if (timeout > 0) { VIR_DEBUG("Registering shutdown timeout %d", timeout); virNetDaemonAutoShutdown(dmn, timeout); } --=20 2.25.1 From nobody Thu May 16 09:15:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847715; cv=none; d=zohomail.com; s=zohoarc; b=jK1SplnwbUO5UOM7PxfDb3MNvUFXjwbIIBT8WShXoPwj9a+KFp1MM/jhVnqj0gcmnHlwiN3VExEL9v0SkAdRbZnT80owOJqmsLDhqLcE/wbH7lz+R/Zgbecp4cmFDdRTcs8hfFmptbPkKHTTkJiAHhMYNPvG6wHeNDkZE4sW6Ok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847715; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+XTSPz9T/pApwnJKQxZ3Rx1q9pr4V/OagI12cU9Q3Tg=; b=BKMlEltgUoAFT5wAS5FbPjOph3O8p6aFi5sJhpkJmHx0Wx2gsbtBi9wUfMuKNB/yN+lgDEObau5rnbeurqecCj7p8tPrpj2/wn44rXMSCrvquGStuBvLgy+Ee8lYh3fDv4+oxJgPVcmQtashscwqdc9P/33BlGVCBea7OnKHz34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1585847715869584.4108728471191; Thu, 2 Apr 2020 10:15:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-443-y9-5ms-dNQ6-YyIPFi61Eg-1; Thu, 02 Apr 2020 13:15:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F091CDB70; Thu, 2 Apr 2020 17:14:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7C7C5C1B0; Thu, 2 Apr 2020 17:14:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 86C17944D8; Thu, 2 Apr 2020 17:14:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEdxc011688 for ; Thu, 2 Apr 2020 13:14:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6C47310016E8; Thu, 2 Apr 2020 17:14:39 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EB371001B28 for ; Thu, 2 Apr 2020 17:14:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847714; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+XTSPz9T/pApwnJKQxZ3Rx1q9pr4V/OagI12cU9Q3Tg=; b=BUKSlVlL9MPNsxCeAo1edpsSywfEsZjn1FmT+Pyds/j14T0zi1Fek94VneK94Uf4JaZK22 zVDnuvdx3zumRFxHFE3S0IhKUelZ4/tZlUZdGBrJ37VGmD596BR+Pr9Wi5AVDLidjrCBvG s1cccUuSYKAOJfJye+nME3jL4jmzY8Y= X-MC-Unique: y9-5ms-dNQ6-YyIPFi61Eg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/6] systemd: Tweak existing sysconf files Date: Thu, 2 Apr 2020 19:14:27 +0200 Message-Id: <20200402171431.677434-3-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We're going to add many more later, so start by adjusting the existing ones to more closely follow the example set by libvirtd. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/locking/virtlockd.sysconf | 6 +++--- src/logging/virtlogd.sysconf | 6 +++--- tools/libvirt-guests.sysconf | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/locking/virtlockd.sysconf b/src/locking/virtlockd.sysconf index d44dc464cd..03aea9e1bc 100644 --- a/src/locking/virtlockd.sysconf +++ b/src/locking/virtlockd.sysconf @@ -1,3 +1,3 @@ -# -# Pass extra arguments to virtlockd -#VIRTLOCKD_ARGS=3D +# Customizations for the virtlockd.service systemd unit + +VIRTLOCKD_ARGS=3D"" diff --git a/src/logging/virtlogd.sysconf b/src/logging/virtlogd.sysconf index 5886f35110..67993e83ce 100644 --- a/src/logging/virtlogd.sysconf +++ b/src/logging/virtlogd.sysconf @@ -1,3 +1,3 @@ -# -# Pass extra arguments to virtlogd -#VIRTLOGD_ARGS=3D +# Customizations for the virtlogd.service systemd unit + +VIRTLOGD_ARGS=3D"" diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf index 669b046507..0765efec21 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -1,3 +1,5 @@ +# Customizations for the libvirt-guests.service systemd unit + # URIs to check for running guests # example: URIS=3D'default xen:///system vbox+tcp://host/system lxc:///sys= tem' #URIS=3Ddefault --=20 2.25.1 From nobody Thu May 16 09:15:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847768; cv=none; d=zohomail.com; s=zohoarc; b=RKJ9WG8kaFfbPFiZrG4IAU6tnFCCkGTxCJcb2G3ISivvsZYYGWNiaa8OUSgK/P70VVVlPQDEldVHsNWliMqjseZp+WP1bFjuH3aL6KXi1RoK6qlh3aJF5/8RPPXd2dxJedCK+nxt9Sokv7C/alsNYx///Zm0MkyoZ4aBxVHcaJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847768; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w3TMPNOCpHdp3HiuOT8nh3cB6fwtM7et57DSpfnbZW8=; b=dpTuOL1/0RRcx1B7vEKPGl/MbDhEqId4XhgZWsQrugJwjhDoj3U9sD/DSrFkkyw77XeGtMK7k5DKP6xHfpKD5DY/gxNDpf+E+h3fytLRUymaQz9M5/fePiquSxdOeXTKZdY/+zeC8M7MunLzS8eg5I4LCsUlsSC19B5payXlAKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1585847768158420.96686500245016; Thu, 2 Apr 2020 10:16:08 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303--Z4kZL-WMdeV_E_fA0lA_Q-1; Thu, 02 Apr 2020 13:15:16 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 100AC192D789; Thu, 2 Apr 2020 17:14:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC1E1196AE; Thu, 2 Apr 2020 17:14:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 89E42944DE; Thu, 2 Apr 2020 17:14:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEftO011702 for ; Thu, 2 Apr 2020 13:14:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 753BD1001B28; Thu, 2 Apr 2020 17:14:41 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10E1210016E8 for ; Thu, 2 Apr 2020 17:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847765; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w3TMPNOCpHdp3HiuOT8nh3cB6fwtM7et57DSpfnbZW8=; b=CuebBWYTMzO4SWC0DW943JuSuxPMPa3SLK1OToVMcaSU7iVNPcp9ef9+3uTT1EWlvuxnK2 N8Aur1ZqwsEWGjCQrNHWVSHpQmMPjiRGMkjsNw+6IJ8P7k8YWuDObzotvGnPUkDljZm1du ah7vyXbguqaXPS0wWTSLr9aul34MwoE= X-MC-Unique: -Z4kZL-WMdeV_E_fA0lA_Q-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/6] systemd: Add sysconf files for all daemons Date: Thu, 2 Apr 2020 19:14:28 +0200 Message-Id: <20200402171431.677434-4-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" While not terribly useful in general, tweaking each daemon's timeout (or disabling it off altogether) is a valid use case which we can very easily support while being consistent with what already happens for libvirtd. This is a first step in that direction. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 11 +++++++++++ src/interface/Makefile.inc.am | 2 ++ src/interface/virtinterfaced.service.in | 3 ++- src/interface/virtinterfaced.sysconf | 3 +++ src/libxl/Makefile.inc.am | 2 ++ src/libxl/virtxend.service.in | 3 ++- src/libxl/virtxend.sysconf | 3 +++ src/lxc/Makefile.inc.am | 2 ++ src/lxc/virtlxcd.service.in | 3 ++- src/lxc/virtlxcd.sysconf | 3 +++ src/network/Makefile.inc.am | 2 ++ src/network/virtnetworkd.service.in | 3 ++- src/network/virtnetworkd.sysconf | 3 +++ src/node_device/Makefile.inc.am | 2 ++ src/node_device/virtnodedevd.service.in | 3 ++- src/node_device/virtnodedevd.sysconf | 3 +++ src/nwfilter/Makefile.inc.am | 2 ++ src/nwfilter/virtnwfilterd.service.in | 3 ++- src/nwfilter/virtnwfilterd.sysconf | 3 +++ src/qemu/Makefile.inc.am | 2 ++ src/qemu/virtqemud.service.in | 3 ++- src/qemu/virtqemud.sysconf | 3 +++ src/remote/Makefile.inc.am | 5 ++++- src/remote/virtproxyd.service.in | 3 ++- src/remote/virtproxyd.sysconf | 3 +++ src/secret/Makefile.inc.am | 2 ++ src/secret/virtsecretd.service.in | 3 ++- src/secret/virtsecretd.sysconf | 3 +++ src/storage/Makefile.inc.am | 2 ++ src/storage/virtstoraged.service.in | 3 ++- src/storage/virtstoraged.sysconf | 3 +++ src/vbox/Makefile.inc.am | 2 ++ src/vbox/virtvboxd.service.in | 3 ++- src/vbox/virtvboxd.sysconf | 3 +++ src/vz/Makefile.inc.am | 2 ++ src/vz/virtvzd.service.in | 3 ++- src/vz/virtvzd.sysconf | 3 +++ 37 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 src/interface/virtinterfaced.sysconf create mode 100644 src/libxl/virtxend.sysconf create mode 100644 src/lxc/virtlxcd.sysconf create mode 100644 src/network/virtnetworkd.sysconf create mode 100644 src/node_device/virtnodedevd.sysconf create mode 100644 src/nwfilter/virtnwfilterd.sysconf create mode 100644 src/qemu/virtqemud.sysconf create mode 100644 src/remote/virtproxyd.sysconf create mode 100644 src/secret/virtsecretd.sysconf create mode 100644 src/storage/virtstoraged.sysconf create mode 100644 src/vbox/virtvboxd.sysconf create mode 100644 src/vz/virtvzd.sysconf diff --git a/libvirt.spec.in b/libvirt.spec.in index efeeac31b9..6061a26497 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1532,6 +1532,7 @@ exit 0 %{_unitdir}/virtlockd.socket %{_unitdir}/virtlockd-admin.socket %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd +%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf @@ -1600,6 +1601,7 @@ exit 0 %ghost %{_sysconfdir}/libvirt/nwfilter/*.xml =20 %files daemon-driver-interface +%config(noreplace) %{_sysconfdir}/sysconfig/virtinterfaced %config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf %{_datadir}/augeas/lenses/virtinterfaced.aug %{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug @@ -1611,6 +1613,7 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so =20 %files daemon-driver-network +%config(noreplace) %{_sysconfdir}/sysconfig/virtnetworkd %config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf %{_datadir}/augeas/lenses/virtnetworkd.aug %{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug @@ -1633,6 +1636,7 @@ exit 0 %endif =20 %files daemon-driver-nodedev +%config(noreplace) %{_sysconfdir}/sysconfig/virtnodedevd %config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf %{_datadir}/augeas/lenses/virtnodedevd.aug %{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug @@ -1644,6 +1648,7 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so =20 %files daemon-driver-nwfilter +%config(noreplace) %{_sysconfdir}/sysconfig/virtnwfilterd %config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf %{_datadir}/augeas/lenses/virtnwfilterd.aug %{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug @@ -1657,6 +1662,7 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so =20 %files daemon-driver-secret +%config(noreplace) %{_sysconfdir}/sysconfig/virtsecretd %config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf %{_datadir}/augeas/lenses/virtsecretd.aug %{_datadir}/augeas/lenses/tests/test_virtsecretd.aug @@ -1670,6 +1676,7 @@ exit 0 %files daemon-driver-storage =20 %files daemon-driver-storage-core +%config(noreplace) %{_sysconfdir}/sysconfig/virtstoraged %config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf %{_datadir}/augeas/lenses/virtstoraged.aug %{_datadir}/augeas/lenses/tests/test_virtstoraged.aug @@ -1726,6 +1733,7 @@ exit 0 =20 %if %{with_qemu} %files daemon-driver-qemu +%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug @@ -1753,6 +1761,7 @@ exit 0 =20 %if %{with_lxc} %files daemon-driver-lxc +%config(noreplace) %{_sysconfdir}/sysconfig/virtlxcd %config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf %{_datadir}/augeas/lenses/virtlxcd.aug %{_datadir}/augeas/lenses/tests/test_virtlxcd.aug @@ -1774,6 +1783,7 @@ exit 0 =20 %if %{with_libxl} %files daemon-driver-libxl +%config(noreplace) %{_sysconfdir}/sysconfig/virtxend %config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf %{_datadir}/augeas/lenses/virtxend.aug %{_datadir}/augeas/lenses/tests/test_virtxend.aug @@ -1795,6 +1805,7 @@ exit 0 =20 %if %{with_vbox} %files daemon-driver-vbox +%config(noreplace) %{_sysconfdir}/sysconfig/virtvboxd %config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf %{_datadir}/augeas/lenses/virtvboxd.aug %{_datadir}/augeas/lenses/tests/test_virtvboxd.aug diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 39157c0770..46a43e61db 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -61,6 +61,8 @@ virtinterfaced_CFLAGS =3D \ virtinterfaced_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtinterfaced_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D interface/virtinterfaced.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtinterfaced.service \ virtinterfaced.socket \ diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin= terfaced.service.in index ff3a611d16..4dbd7a627b 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -13,7 +13,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtinterfaced --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtinterfaced +ExecStart=3D@sbindir@/virtinterfaced --timeout 120 $VIRTINTERFACED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinter= faced.sysconf new file mode 100644 index 0000000000..c131f559d2 --- /dev/null +++ b/src/interface/virtinterfaced.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtinterfaced.service systemd unit + +VIRTINTERFACED_ARGS=3D"" diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index ff6a2b0f69..619835a46b 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -73,6 +73,8 @@ virtxend_CFLAGS =3D \ virtxend_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtxend_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D libxl/virtxend.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtxend.service \ virtxend.socket \ diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index b4b6ce6d8c..8a794647ac 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -17,7 +17,8 @@ ConditionPathExists=3D/proc/xen/capabilities =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtxend --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtxend +ExecStart=3D@sbindir@/virtxend --timeout 120 $VIRTXEND_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure KillMode=3Dprocess diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf new file mode 100644 index 0000000000..7fa4b7b464 --- /dev/null +++ b/src/libxl/virtxend.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtxend.service systemd unit + +VIRTXEND_ARGS=3D"" diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index 2fee607d3d..b8c2e1eb3d 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -136,6 +136,8 @@ virtlxcd_CFLAGS =3D \ virtlxcd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtlxcd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D lxc/virtlxcd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtlxcd.service \ virtlxcd.socket \ diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 33f8ca2d4d..0665f21ee0 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -18,7 +18,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtlxcd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlxcd +ExecStart=3D@sbindir@/virtlxcd --timeout 120 $VIRTLXCD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf new file mode 100644 index 0000000000..d342aec88b --- /dev/null +++ b/src/lxc/virtlxcd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtlxcd.service systemd unit + +VIRTLXCD_ARGS=3D"" diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index bc05b01987..196a30e16c 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -69,6 +69,8 @@ virtnetworkd_CFLAGS =3D \ virtnetworkd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtnetworkd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D network/virtnetworkd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtnetworkd.service \ virtnetworkd.socket \ diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd= .service.in index 656e8b4f84..beef277a34 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -13,7 +13,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtnetworkd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnetworkd +ExecStart=3D@sbindir@/virtnetworkd --timeout 120 $VIRTNETWORKD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure KillMode=3Dprocess diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sy= sconf new file mode 100644 index 0000000000..fda82c1a76 --- /dev/null +++ b/src/network/virtnetworkd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtnetworkd.service systemd unit + +VIRTNETWORKD_ARGS=3D"" diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc= .am index 0b287189bc..788563665f 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -84,6 +84,8 @@ virtnodedevd_CFLAGS =3D \ virtnodedevd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtnodedevd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D node_device/virtnodedevd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtnodedevd.service \ virtnodedevd.socket \ diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt= nodedevd.service.in index 132ee05a7f..4795fc9167 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -13,7 +13,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtnodedevd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnodedevd +ExecStart=3D@sbindir@/virtnodedevd --timeout 120 $VIRTNODEDEVD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnod= edevd.sysconf new file mode 100644 index 0000000000..9ffea04634 --- /dev/null +++ b/src/node_device/virtnodedevd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtnodedevd.service systemd unit + +VIRTNODEDEVD_ARGS=3D"" diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 9a68fd80b6..20db8090e0 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -70,6 +70,8 @@ virtnwfilterd_CFLAGS =3D \ virtnwfilterd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtnwfilterd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D nwfilter/virtnwfilterd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtnwfilterd.service \ virtnwfilterd.socket \ diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil= terd.service.in index 57c2fafe43..3517232edc 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -13,7 +13,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtnwfilterd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnwfilterd +ExecStart=3D@sbindir@/virtnwfilterd --timeout 120 $VIRTNWFILTERD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilter= d.sysconf new file mode 100644 index 0000000000..4d46b6581a --- /dev/null +++ b/src/nwfilter/virtnwfilterd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtnwfilterd.service systemd unit + +VIRTNWFILTERD_ARGS=3D"" diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 51cd79879d..c42c470a4c 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -146,6 +146,8 @@ virtqemud_CFLAGS =3D \ virtqemud_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtqemud_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D qemu/virtqemud.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtqemud.service \ virtqemud.socket \ diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index aa24bdaab7..55a95640b1 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -18,7 +18,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtqemud --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtqemud +ExecStart=3D@sbindir@/virtqemud --timeout 120 $VIRTQEMUD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf new file mode 100644 index 0000000000..1bab275240 --- /dev/null +++ b/src/qemu/virtqemud.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtqemud.service systemd unit + +VIRTQEMUD_ARGS=3D"" diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 958bd18f86..1b1be8340d 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -88,7 +88,10 @@ LOGROTATE_FILES_IN +=3D \ remote/libvirtd.logrotate.in \ $(NULL) =20 -SYSCONF_FILES +=3D remote/libvirtd.sysconf +SYSCONF_FILES +=3D \ + remote/libvirtd.sysconf \ + remote/virtproxyd.sysconf \ + $(NULL) =20 LIBVIRTD_SOCKET_UNIT_FILES_IN =3D \ remote/libvirtd.socket.in \ diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in index e99e2af19c..39d82bb53d 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -13,7 +13,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtproxyd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtproxyd +ExecStart=3D@sbindir@/virtproxyd --timeout 120 $VIRTPROXYD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf new file mode 100644 index 0000000000..805b6185b5 --- /dev/null +++ b/src/remote/virtproxyd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtproxyd.service systemd unit + +VIRTPROXYD_ARGS=3D"" diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 63c8bc6dba..a8390f8265 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -47,6 +47,8 @@ virtsecretd_CFLAGS =3D \ virtsecretd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtsecretd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D secret/virtsecretd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtsecretd.service \ virtsecretd.socket \ diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser= vice.in index 00cdc26b97..84f2001028 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -13,7 +13,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtsecretd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtsecretd +ExecStart=3D@sbindir@/virtsecretd --timeout 120 $VIRTSECRETD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf new file mode 100644 index 0000000000..9303dd7bcc --- /dev/null +++ b/src/secret/virtsecretd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtsecretd.service systemd unit + +VIRTSECRETD_ARGS=3D"" diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 3655b8a53c..2f46d244f3 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -162,6 +162,8 @@ virtstoraged_CFLAGS =3D \ virtstoraged_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtstoraged_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D storage/virtstoraged.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtstoraged.service \ virtstoraged.socket \ diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in index 9aa26764a9..a33fb289d5 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -15,7 +15,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtstoraged --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtstoraged +ExecStart=3D@sbindir@/virtstoraged --timeout 120 $VIRTSTORAGED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sy= sconf new file mode 100644 index 0000000000..268d80b902 --- /dev/null +++ b/src/storage/virtstoraged.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtstoraged.service systemd unit + +VIRTSTORAGED_ARGS=3D"" diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am index 72a15c6468..8d2467f39e 100644 --- a/src/vbox/Makefile.inc.am +++ b/src/vbox/Makefile.inc.am @@ -81,6 +81,8 @@ virtvboxd_CFLAGS =3D \ virtvboxd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtvboxd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D vbox/virtvboxd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtvboxd.service \ virtvboxd.socket \ diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index 7e0f7518d6..8240c45646 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -14,7 +14,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtvboxd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvboxd +ExecStart=3D@sbindir@/virtvboxd --timeout 120 $VIRTVBOXD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf new file mode 100644 index 0000000000..a94c8ae23c --- /dev/null +++ b/src/vbox/virtvboxd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtvboxd.service systemd unit + +VIRTVBOXD_ARGS=3D"" diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index cabe18a9a1..f60f73bf06 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -56,6 +56,8 @@ virtvzd_CFLAGS =3D \ virtvzd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS) virtvzd_LDADD =3D $(REMOTE_DAEMON_LD_ADD) =20 +SYSCONF_FILES +=3D vz/virtvzd.sysconf + SYSTEMD_UNIT_FILES +=3D \ virtvzd.service \ virtvzd.socket \ diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index cd0f558768..15ccfeb172 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -14,7 +14,8 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -ExecStart=3D@sbindir@/virtvzd --timeout 120 +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvzd +ExecStart=3D@sbindir@/virtvzd --timeout 120 $VIRTVZD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf new file mode 100644 index 0000000000..7db30df94b --- /dev/null +++ b/src/vz/virtvzd.sysconf @@ -0,0 +1,3 @@ +# Customizations for the virtvzd.service systemd unit + +VIRTVZD_ARGS=3D"" --=20 2.25.1 From nobody Thu May 16 09:15:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847773; cv=none; d=zohomail.com; s=zohoarc; b=FZC7XH4PkVGfOxQpIQTE5TM5oMxhFSV43nIdBsUOTzJOSKSCgs42HqtoJISi8Ku96tSAH33JhLKC591tTQof+0piOXtu3BgtQLKmLHaPM7bMGYaU44Px5X7PL84e7RxNpWdXDV7Y7OyUObJuzFqL1wA1bGHydCXYMQN+INV3Mis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847773; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K9EQpbYDHZ0Cr2ClOK9ZSV4qaV4c0vfdZb47/qgmP0I=; b=QkiJn1uJ2CrkWBsh7HjU+uS6ub81dGEGPlM//CpGR6BGRApQ/1A+Vhurzi8hoJGX8DaJmRBYpHWaz8nFEyj2vTXij3uyXwvdpxaJ8EQAwaWUGoXVA5YxAxOX1WALI6xPnfEAnVgE7K/NLtkiPeEozWLTT6n6WQAr17C4aRxffmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585847773269954.1293238962608; Thu, 2 Apr 2020 10:16:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-xrMWmfQHORKsy2POxLEedQ-1; Thu, 02 Apr 2020 13:15:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F4C6802C9F; Thu, 2 Apr 2020 17:14:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EAE8E9B924; Thu, 2 Apr 2020 17:14:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A5E29944D8; Thu, 2 Apr 2020 17:14:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEgkX011707 for ; Thu, 2 Apr 2020 13:14:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id B5EEA1001B2D; Thu, 2 Apr 2020 17:14:42 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FE5B1001B28 for ; Thu, 2 Apr 2020 17:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847771; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=K9EQpbYDHZ0Cr2ClOK9ZSV4qaV4c0vfdZb47/qgmP0I=; b=d25gpkqXyX/AyMGarjWxVqZD6Qb6QOYsyF+yfIuYEQMmT46eaHpZF0WyFXgoyYMDAx2vpL wU0fuXjBMQPJuGrBaVrp5bBayTGi2w5TuwoJ6/vVgMbDz4IRujsgvUp88Hj1Yo2ElMkTRs N6MHMQ1STHhlBrFa+gMlCzE7cGYXLAQ= X-MC-Unique: xrMWmfQHORKsy2POxLEedQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/6] systemd: Move timeout from service files to sysconf files Date: Thu, 2 Apr 2020 19:14:29 +0200 Message-Id: <20200402171431.677434-5-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This follows the example set by libvirtd, and makes it easier for the admin to tweak the timeout or disable it altogether. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/interface/virtinterfaced.service.in | 2 +- src/interface/virtinterfaced.sysconf | 2 +- src/libxl/virtxend.service.in | 2 +- src/libxl/virtxend.sysconf | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/lxc/virtlxcd.sysconf | 2 +- src/network/virtnetworkd.service.in | 2 +- src/network/virtnetworkd.sysconf | 2 +- src/node_device/virtnodedevd.service.in | 2 +- src/node_device/virtnodedevd.sysconf | 2 +- src/nwfilter/virtnwfilterd.service.in | 2 +- src/nwfilter/virtnwfilterd.sysconf | 2 +- src/qemu/virtqemud.service.in | 2 +- src/qemu/virtqemud.sysconf | 2 +- src/remote/virtproxyd.service.in | 2 +- src/remote/virtproxyd.sysconf | 2 +- src/secret/virtsecretd.service.in | 2 +- src/secret/virtsecretd.sysconf | 2 +- src/storage/virtstoraged.service.in | 2 +- src/storage/virtstoraged.sysconf | 2 +- src/vbox/virtvboxd.service.in | 2 +- src/vbox/virtvboxd.sysconf | 2 +- src/vz/virtvzd.service.in | 2 +- src/vz/virtvzd.sysconf | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin= terfaced.service.in index 4dbd7a627b..73d409b81b 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtinterfaced -ExecStart=3D@sbindir@/virtinterfaced --timeout 120 $VIRTINTERFACED_ARGS +ExecStart=3D@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinter= faced.sysconf index c131f559d2..0685da31b8 100644 --- a/src/interface/virtinterfaced.sysconf +++ b/src/interface/virtinterfaced.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtinterfaced.service systemd unit =20 -VIRTINTERFACED_ARGS=3D"" +VIRTINTERFACED_ARGS=3D"--timeout 120" diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 8a794647ac..a863917467 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -18,7 +18,7 @@ ConditionPathExists=3D/proc/xen/capabilities [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtxend -ExecStart=3D@sbindir@/virtxend --timeout 120 $VIRTXEND_ARGS +ExecStart=3D@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure KillMode=3Dprocess diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf index 7fa4b7b464..301da47e8d 100644 --- a/src/libxl/virtxend.sysconf +++ b/src/libxl/virtxend.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtxend.service systemd unit =20 -VIRTXEND_ARGS=3D"" +VIRTXEND_ARGS=3D"--timeout 120" diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 0665f21ee0..3af7c1a52d 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -19,7 +19,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlxcd -ExecStart=3D@sbindir@/virtlxcd --timeout 120 $VIRTLXCD_ARGS +ExecStart=3D@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf index d342aec88b..119a4a23f3 100644 --- a/src/lxc/virtlxcd.sysconf +++ b/src/lxc/virtlxcd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtlxcd.service systemd unit =20 -VIRTLXCD_ARGS=3D"" +VIRTLXCD_ARGS=3D"--timeout 120" diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd= .service.in index beef277a34..e7f1326945 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnetworkd -ExecStart=3D@sbindir@/virtnetworkd --timeout 120 $VIRTNETWORKD_ARGS +ExecStart=3D@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure KillMode=3Dprocess diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sy= sconf index fda82c1a76..93f3a7a327 100644 --- a/src/network/virtnetworkd.sysconf +++ b/src/network/virtnetworkd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnetworkd.service systemd unit =20 -VIRTNETWORKD_ARGS=3D"" +VIRTNETWORKD_ARGS=3D"--timeout 120" diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt= nodedevd.service.in index 4795fc9167..d2453dd620 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnodedevd -ExecStart=3D@sbindir@/virtnodedevd --timeout 120 $VIRTNODEDEVD_ARGS +ExecStart=3D@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnod= edevd.sysconf index 9ffea04634..fa7faa3a79 100644 --- a/src/node_device/virtnodedevd.sysconf +++ b/src/node_device/virtnodedevd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnodedevd.service systemd unit =20 -VIRTNODEDEVD_ARGS=3D"" +VIRTNODEDEVD_ARGS=3D"--timeout 120" diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil= terd.service.in index 3517232edc..dda7c01a3d 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnwfilterd -ExecStart=3D@sbindir@/virtnwfilterd --timeout 120 $VIRTNWFILTERD_ARGS +ExecStart=3D@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilter= d.sysconf index 4d46b6581a..80cc645ba5 100644 --- a/src/nwfilter/virtnwfilterd.sysconf +++ b/src/nwfilter/virtnwfilterd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnwfilterd.service systemd unit =20 -VIRTNWFILTERD_ARGS=3D"" +VIRTNWFILTERD_ARGS=3D"--timeout 120" diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 55a95640b1..8abc9d3a7f 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -19,7 +19,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtqemud -ExecStart=3D@sbindir@/virtqemud --timeout 120 $VIRTQEMUD_ARGS +ExecStart=3D@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf index 1bab275240..70f76c7c47 100644 --- a/src/qemu/virtqemud.sysconf +++ b/src/qemu/virtqemud.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtqemud.service systemd unit =20 -VIRTQEMUD_ARGS=3D"" +VIRTQEMUD_ARGS=3D"--timeout 120" diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in index 39d82bb53d..f43ce9ee6e 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtproxyd -ExecStart=3D@sbindir@/virtproxyd --timeout 120 $VIRTPROXYD_ARGS +ExecStart=3D@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf index 805b6185b5..0fc5c61096 100644 --- a/src/remote/virtproxyd.sysconf +++ b/src/remote/virtproxyd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtproxyd.service systemd unit =20 -VIRTPROXYD_ARGS=3D"" +VIRTPROXYD_ARGS=3D"--timeout 120" diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser= vice.in index 84f2001028..8444142a3a 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtsecretd -ExecStart=3D@sbindir@/virtsecretd --timeout 120 $VIRTSECRETD_ARGS +ExecStart=3D@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf index 9303dd7bcc..2247d05964 100644 --- a/src/secret/virtsecretd.sysconf +++ b/src/secret/virtsecretd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtsecretd.service systemd unit =20 -VIRTSECRETD_ARGS=3D"" +VIRTSECRETD_ARGS=3D"--timeout 120" diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in index a33fb289d5..fc3e9a1b69 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -16,7 +16,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtstoraged -ExecStart=3D@sbindir@/virtstoraged --timeout 120 $VIRTSTORAGED_ARGS +ExecStart=3D@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sy= sconf index 268d80b902..122373eb7c 100644 --- a/src/storage/virtstoraged.sysconf +++ b/src/storage/virtstoraged.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtstoraged.service systemd unit =20 -VIRTSTORAGED_ARGS=3D"" +VIRTSTORAGED_ARGS=3D"--timeout 120" diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index 8240c45646..ebb31dde07 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -15,7 +15,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvboxd -ExecStart=3D@sbindir@/virtvboxd --timeout 120 $VIRTVBOXD_ARGS +ExecStart=3D@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf index a94c8ae23c..37ad353d54 100644 --- a/src/vbox/virtvboxd.sysconf +++ b/src/vbox/virtvboxd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtvboxd.service systemd unit =20 -VIRTVBOXD_ARGS=3D"" +VIRTVBOXD_ARGS=3D"--timeout 120" diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index 15ccfeb172..f551cb8fbf 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -15,7 +15,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvzd -ExecStart=3D@sbindir@/virtvzd --timeout 120 $VIRTVZD_ARGS +ExecStart=3D@sbindir@/virtvzd $VIRTVZD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure =20 diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf index 7db30df94b..a86b9dfb6c 100644 --- a/src/vz/virtvzd.sysconf +++ b/src/vz/virtvzd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtvzd.service systemd unit =20 -VIRTVZD_ARGS=3D"" +VIRTVZD_ARGS=3D"--timeout 120" --=20 2.25.1 From nobody Thu May 16 09:15:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847720; cv=none; d=zohomail.com; s=zohoarc; b=cOktqLvAChVGP2U0hqgoY62j9R9wVXanzMKD1bOSuAXELxi4Kze6Me44BmRtKtAXJASJ2pu3SxN7ICXGAa+NsCPYUs/udnzmaACuoNlF6uuw00sye0zcmVkhOMqpa++gZYaBINelvlIH2IkmlRcMZf/dwtJ88rshB6ga3rh2/tk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847720; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BMC1uB7Xv3hSkKjptmIazz58WIK5vl/GEQRE76UM4NQ=; b=Dx13g9/vCYFDbO25vefWCGsN9bNiFFxxwja91PgcirRwbND5VihdRMU00ZiPL/Ia4SsiHq5DJWoQK6O39N67WTf0clM4TNWSlBv1yGcRoquhtiYzZ0duJX5fxz8DbunXmnIokZUQSLCU4WYP500tLLFvRhXt+dJqZz8kP+QtFcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 158584772061142.81323715865051; Thu, 2 Apr 2020 10:15:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-26-DvFMW7VUN16YMKAzkMulEQ-1; Thu, 02 Apr 2020 13:15:17 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 177C610CE792; Thu, 2 Apr 2020 17:14:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2CE310016E8; Thu, 2 Apr 2020 17:14:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C92D180612F; Thu, 2 Apr 2020 17:14:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEiCU011719 for ; Thu, 2 Apr 2020 13:14:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 279251001B2D; Thu, 2 Apr 2020 17:14:44 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54B5310016E8 for ; Thu, 2 Apr 2020 17:14:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847719; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BMC1uB7Xv3hSkKjptmIazz58WIK5vl/GEQRE76UM4NQ=; b=HkwDD6a/DGG3S7nBoKEXFLgn1Ri+mNWBNife69cZbl5t4KrMRbZbxMQeA8rOdxrx1X/0Yh e7J0qxCi5dYAHkTFHdk9tIYLsr0i2Yq2I5ycvgOSoakt85kZml51UmSB2/5Dp2ZNJDV+Ir IPmhOwPnN4/n35wrnsPtrS+x5ZRiXX0= X-MC-Unique: DvFMW7VUN16YMKAzkMulEQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 5/6] qemu: Allow audio driver override in virtqemud Date: Thu, 2 Apr 2020 19:14:30 +0200 Message-Id: <20200402171431.677434-6-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" libvirtd supports this feature, and virtqemud ultimately calls to the same code so it does as well: advertise it in the sysconf file for the latter, as is already the case for the former. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/virtqemud.sysconf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf index 70f76c7c47..87b626e3ed 100644 --- a/src/qemu/virtqemud.sysconf +++ b/src/qemu/virtqemud.sysconf @@ -1,3 +1,12 @@ # Customizations for the virtqemud.service systemd unit =20 VIRTQEMUD_ARGS=3D"--timeout 120" + +# Override the QEMU/SDL default audio driver probing when +# starting virtual machines using SDL graphics +# +# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio +# is enabled in /etc/libvirt/qemu.conf +#QEMU_AUDIO_DRV=3Dsdl +# +#SDL_AUDIODRIVER=3Dpulse --=20 2.25.1 From nobody Thu May 16 09:15:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585847772; cv=none; d=zohomail.com; s=zohoarc; b=ahsKM7wbzOL0q7vWWoJkR3gSjsWydz4CMd4iK9er/FvwR0DGzFt2fJ0O9Ga/+oeTC3+zoAdwVKEo2PsTc8R7QKJGYyeU9ZQ9RtGyxoibX8fUXzbvW9Ihn3plqeuPYwjGhRpCXJSyi3mQcGzSNs2CNIIphVSRF5oBRcEqCBQQO7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585847772; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GJjajq5oZtDvv0mod0TR+YnpCNE38ZnVXnou4IMybiQ=; b=HHhBAR/iEU0JwxCfahXHJES+6ZyZymfLOD82gbhI4MYRuR0tPuyUiZ/20AT0/sU169otRUJ1vl7D4EVdgO0X1fio0WzCUjgwk3fQyhYnjgvtmRd0WZ7ael3DIGutgZOPsdbwF3pJ5cFINLNdV5H4RX3JafqM9llygb6HKGP7PxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585847772052900.9498062667408; Thu, 2 Apr 2020 10:16:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-166-On5jiRyIMV2ikNo2KVTH_Q-1; Thu, 02 Apr 2020 13:15:19 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5BA58024E6; Thu, 2 Apr 2020 17:14:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CC0E5D9CD; Thu, 2 Apr 2020 17:14:59 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 56192944DF; Thu, 2 Apr 2020 17:14:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 032HEjw1011730 for ; Thu, 2 Apr 2020 13:14:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6216F1001B28; Thu, 2 Apr 2020 17:14:45 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.195.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A3E5810016E8 for ; Thu, 2 Apr 2020 17:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585847770; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GJjajq5oZtDvv0mod0TR+YnpCNE38ZnVXnou4IMybiQ=; b=HNCp+oj60zkGTncMc0rZpZPmHlARMu/YMyNbWvhsZIOszMnmnnmlA7TD2WzW43hRm6tjjP YNYrd09dSEyB/It+xAA0gxVUpXZSguwqukT9ZPVF5NYy++brpKUOAkgoZ+C388Owq/I7H1 9kwUm3XOIEWu0c/Ydx8js0qfCnhehXQ= X-MC-Unique: On5jiRyIMV2ikNo2KVTH_Q-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 6/6] remote: Drop KRB5_KTNAME override Date: Thu, 2 Apr 2020 19:14:31 +0200 Message-Id: <20200402171431.677434-7-abologna@redhat.com> In-Reply-To: <20200402171431.677434-1-abologna@redhat.com> References: <20200402171431.677434-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When the comment in libvirtd.sasl was last updated with commit fe772f24a6809b3d937ed6547cbaa9d820e514b6 Author: Cole Robinson Date: Sat Oct 20 14:10:03 2012 -0400 daemon: Avoid 'Could not find keytab file' in syslog it was noted that only old versions of kerberos would need the environment variable to be set: that was more than seven years ago, so it's safe to assume that none of our current target platforms still requires that hack and setting the appropriate key in the configuration file will be enough. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko Reviewed-by: Daniel P. Berrang=C3=A9 --- src/remote/libvirtd.init.in | 1 - src/remote/libvirtd.sasl | 4 +--- src/remote/libvirtd.sysconf | 3 --- src/remote/virtproxyd.init.in | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/remote/libvirtd.init.in b/src/remote/libvirtd.init.in index b708befbc5..91228db411 100644 --- a/src/remote/libvirtd.init.in +++ b/src/remote/libvirtd.init.in @@ -7,7 +7,6 @@ LIBVIRTD_TIMEOUT=3D${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"} =20 command=3D"@sbindir@/libvirtd" command_args=3D"-d ${LIBVIRTD_OPTS}" -start_stop_daemon_args=3D"--env KRB5_KTNAME=3D/etc/libvirt/krb5.tab" pidfile=3D"@runstatedir@/libvirtd.pid" retry=3D"${LIBVIRTD_TERMTIMEOUT}" =20 diff --git a/src/remote/libvirtd.sasl b/src/remote/libvirtd.sasl index 9e7699c75a..7a45470a9d 100644 --- a/src/remote/libvirtd.sasl +++ b/src/remote/libvirtd.sasl @@ -33,9 +33,7 @@ mech_list: gssapi # qemu+tcp://hostname/system?auth=3Dsasl.gssapi #mech_list: scram-sha-1 gssapi =20 -# Some older builds of MIT kerberos on Linux ignore this option & -# instead need KRB5_KTNAME env var. -# For modern Linux, and other OS, this should be sufficient +# File containing the service principal for libvirtd # keytab: /etc/libvirt/krb5.tab =20 diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf index ee9db22bab..18aec1ba67 100644 --- a/src/remote/libvirtd.sysconf +++ b/src/remote/libvirtd.sysconf @@ -11,9 +11,6 @@ LIBVIRTD_ARGS=3D"--timeout 120" # can be used to listen on TCP/TLS sockets #LIBVIRTD_ARGS=3D"--listen" =20 -# Override Kerberos service keytab for SASL/GSSAPI -#KRB5_KTNAME=3D/etc/libvirt/krb5.tab - # Override the QEMU/SDL default audio driver probing when # starting virtual machines using SDL graphics # diff --git a/src/remote/virtproxyd.init.in b/src/remote/virtproxyd.init.in index b644c084a9..436b2b6c0d 100644 --- a/src/remote/virtproxyd.init.in +++ b/src/remote/virtproxyd.init.in @@ -7,7 +7,6 @@ VIRTPROXYD_TIMEOUT=3D${VIRTPROXYD_TERMTIMEOUT:-"TERM/25/KIL= L/5"} =20 command=3D"@sbindir@/virtproxyd" command_args=3D"-d ${VIRTPROXYD_OPTS}" -start_stop_daemon_args=3D"--env KRB5_KTNAME=3D/etc/libvirt/krb5.tab" pidfile=3D"@runstatedir@/virtproxyd.pid" retry=3D"${VIRTPROXYD_TERMTIMEOUT}" =20 --=20 2.25.1