From nobody Wed May 15 23:52:49 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=1585767501; cv=none; d=zohomail.com; s=zohoarc; b=XnAqxcMzqKPcNqvXaBmoBF8h+E+hfYk67iQFQnwF2QhzTxytMMnqihnwnaqz9PnM0VMbEUydoZoDKCvytkcy8ci34bJ4xtioLP8zv4cd9dI4pPWoEYfT4gdDh3ji9HYPxzDJgHPE5mwMB2gKLPiWZs5UNtsxPcdQUKyQoY3K6zo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767501; 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=yoRmMq1fziu+prMteniaZY/9QyVrNWEJaqsvF/yQZ1A=; b=FGhwfXBygc4hXReM3qVP/abxOsEZL15k6M1HemCDFji3Bm6YUJVE0Wp5yksK4njv07oy415Jyo2/DNzVz1FUJ080uI9MML59/WNCfethg5RmAoHAzsHpePj7BhMXZaR1CfClVG1g0agnARY8i4FzTUQzs/ViBrSsDH2so4Bd+ec= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1585767501319455.5796428650426; Wed, 1 Apr 2020 11:58:21 -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-71-J5zzBPfWOb6dO7q5TdCnrg-1; Wed, 01 Apr 2020 14:58:17 -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 CA91C800D53; Wed, 1 Apr 2020 18:58:11 +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 980ECD7691; Wed, 1 Apr 2020 18:58:11 +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 4772A18034EA; Wed, 1 Apr 2020 18:58:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031IrsAs027781 for ; Wed, 1 Apr 2020 14:53:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 927B199DFD; Wed, 1 Apr 2020 18:53:54 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C200A99DEE for ; Wed, 1 Apr 2020 18:53:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767500; 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=yoRmMq1fziu+prMteniaZY/9QyVrNWEJaqsvF/yQZ1A=; b=Z61p4PILKHLIsAsIlAuOiFqV4wyJLMvjlPmUgV8YhXG7PRqog/mB15PyPZJGeGBjaSOyiC UQR/dBAu3jJC9m/i1qRePUVOgFiaDm+3eGCs98SUFz0me97dR2iUy7/fb5l+AkX18DLq1i m1U26dE0OShU/oUzupk2ghY5oEAlrC8= X-MC-Unique: J5zzBPfWOb6dO7q5TdCnrg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/8] daemons: Support --timeout 0 Date: Wed, 1 Apr 2020 20:53:38 +0200 Message-Id: <20200401185345.248398-2-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 --- 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 Wed May 15 23:52:49 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=1585767252; cv=none; d=zohomail.com; s=zohoarc; b=hu71nv5FTjfQ4L4j8IEeJa6lH125MbjeLhmQ0kTe9D3AjZ1RVpDN0gIQtAtmUHyzi+j411VqqNCgkKYzB69BLowcJi5/wZlnZwSUqDnhIRw9LqdNseI/VQAZDgXx8erjAXnBP4c0WMnT6eCJKg8rnrWrr3C9256xwkU0jDewkKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767252; 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=t0Q+Y9oTFpXRpbT3xN8gxcdUXigQ76oJL/DWbm31NSk=; b=DbssTinySj5NCDvFZkt0VaGyH+7ha1Y17zJm780AgP36MR/RWQ6zCREtt1YcRvdQXX60pGkX+BQeRSaXmGRsKV/ct7pA8pzkCyzJUO7C89Y/NtqoTOnCLAQQQD7Aq2t8wwHNCRZmi21Bp67xiS+L+mk2PSz+yqeofp2nO/cQNOI= 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 1585767252476310.0754624771524; Wed, 1 Apr 2020 11:54: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-235-vuaKv92_NiqNIlW_wxqw5Q-1; Wed, 01 Apr 2020 14:54:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BF53100DFC2; Wed, 1 Apr 2020 18:54:00 +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 BC27060BEC; Wed, 1 Apr 2020 18:53: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 8DAC387A72; Wed, 1 Apr 2020 18:53:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031IrudX027793 for ; Wed, 1 Apr 2020 14:53:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F01299DF6; Wed, 1 Apr 2020 18:53:56 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31FD199DEE for ; Wed, 1 Apr 2020 18:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767250; 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=t0Q+Y9oTFpXRpbT3xN8gxcdUXigQ76oJL/DWbm31NSk=; b=T+JwqfhWDFoD41FHXMsDB+bmGbOB3UOzqC8yB/p6lYVRjKF01Ez58mq6r0ebSV1pNbG5pO lSNZt2cXL/2f0bzZU54u3G4rxX1r06OsF08Izp62lag3ar+WWXcTNfMJCj/kDueYSkBqGK n2Jeh9Sz19BIpe97mIZozcB7s+/WCmI= X-MC-Unique: vuaKv92_NiqNIlW_wxqw5Q-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/8] Revert "remote: move timeout arg into sysconf file" Date: Wed, 1 Apr 2020 20:53:39 +0200 Message-Id: <20200401185345.248398-3-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.12 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" There is nothing really systemd-specific about passing extra arguments to daemons so it's reasonable, although not currently the case, that startup scripts written for other init systems might want to source these sysconf files; for those init systems, which likely do not support socket activation, making the daemon quit after a timeout has expired is probably not a good idea. More generally, the sysconf files should not reflect the default behavior, but only contain overrides explicitly put in place by the admin; now that we have a mechanism to disable timeouts regardless of the default set in the service file, that argument for having the default timeout in the sysconf file is moot as well. This reverts commit 581767a98ab5f674ac335d6c270efa8576bfdfbf. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- src/remote/libvirtd.service.in | 6 +++++- src/remote/libvirtd.sysconf | 12 +++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 90b2cad5b0..3e2d716af7 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -26,7 +26,11 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirtd -ExecStart=3D@sbindir@/libvirtd $LIBVIRTD_ARGS +# libvirtd.service is set to run on boot so that autostart of +# VMs can be performed. We don't want it to stick around if +# unused though, so we set a timeout. The socket activation +# then ensures it gets started again if anything needs it +ExecStart=3D@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess Restart=3Don-failure diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf index ee9db22bab..5969518bf2 100644 --- a/src/remote/libvirtd.sysconf +++ b/src/remote/libvirtd.sysconf @@ -1,14 +1,8 @@ # Customizations for the libvirtd.service systemd unit =20 -# Default behaviour is for libvirtd.service to start on boot -# so that VM autostart can be performed. We then want it to -# shutdown again if nothing was started and rely on systemd -# socket activation to start it again when some client app -# connects. -LIBVIRTD_ARGS=3D"--timeout 120" - -# If systemd socket activation is disabled, then the following -# can be used to listen on TCP/TLS sockets +# Listen for TCP/IP connections. This is not required if using systemd +# socket activation. +# NB. must setup TLS/SSL keys prior to using this #LIBVIRTD_ARGS=3D"--listen" =20 # Override Kerberos service keytab for SASL/GSSAPI --=20 2.25.1 From nobody Wed May 15 23:52:49 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-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=1585767263; cv=none; d=zohomail.com; s=zohoarc; b=WxZjr0Ko/53JCcfkuk6zdYK4IT3m7oHoZP2Op1tcvFNoJVn/VHemn+qg/tZ7ATKkVPZCnF5/xYRzJgShumsfiI90xjysjl3KTeVNhPElwZ7X+rFODQOXAP/JPYShiSFXdpUAP0TM2Ns7zfTO6s8hlmG7eooEvQCB7bKeVOkD7Sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767263; 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=ungsxGNREyIHbCoNAi6jbyhuFdcOaz4rv7ViphYWCbU=; b=llQaIaqTVJdkUGbGaR2TgDAaGoao18ozJNMaNCcHzE1DZ5pvBsM/e2U+1MGx8t2m5Y6kEQpX0OwkBsimCy3lH2875Gkx6ZA/o5puPN4dcXrkn8Ij/r1pF3zDTVu8T77ZcdhFDaOvGFvOnh4hxu61DRdZFMq6Ti4CdGIkEGe3zZ8= 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1585767263700834.7661534822124; Wed, 1 Apr 2020 11:54:23 -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-16-lUPzFrPkN6-KMjL8EaY-Rg-1; Wed, 01 Apr 2020 14:54:19 -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 C78D0801FA1; Wed, 1 Apr 2020 18:54:13 +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 92E0918A85; Wed, 1 Apr 2020 18:54:13 +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 116B88B2B0; Wed, 1 Apr 2020 18:54:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031IrvJJ027800 for ; Wed, 1 Apr 2020 14:53:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id A33B299DF8; Wed, 1 Apr 2020 18:53:57 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D272799DE4 for ; Wed, 1 Apr 2020 18:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767262; 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=ungsxGNREyIHbCoNAi6jbyhuFdcOaz4rv7ViphYWCbU=; b=BpgccPyYkC8GDJ5h0FIG+gaG9d7d+Z/H2Fji8SCBebdYZZdtd4v/iUXYG0Er8ysJC7H6YJ OfPnKVPGyb8x/WvpmHg2enNJDoShoL+M0F3vsgCJMwS+g7qO84lATv2HsZt6E+Mb/XjwWx mrjJUqrERUQ8wWSGS9MpWzPmX8FdzG0= X-MC-Unique: lUPzFrPkN6-KMjL8EaY-Rg-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/8] Revert "logging: Use default timeout of 120 seconds for virtlogd" Date: Wed, 1 Apr 2020 20:53:40 +0200 Message-Id: <20200401185345.248398-4-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" The sysconf file is not the correct place for this. This reverts commit 02b6005063d6e8b5c6c695ed1ffaf10ef45143b0. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- src/logging/virtlogd.sysconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logging/virtlogd.sysconf b/src/logging/virtlogd.sysconf index 678af34faf..5886f35110 100644 --- a/src/logging/virtlogd.sysconf +++ b/src/logging/virtlogd.sysconf @@ -1,3 +1,3 @@ # # Pass extra arguments to virtlogd -VIRTLOGD_ARGS=3D"--timeout 120" +#VIRTLOGD_ARGS=3D --=20 2.25.1 From nobody Wed May 15 23:52:49 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=1585767267; cv=none; d=zohomail.com; s=zohoarc; b=DZxcGU4NwgdCJfLzErWpao8WoP11Y7S+irE2ac5/Kjy3u78My2QZD6ZWnrp8k8pGJIdm7zILGQjwBZuy2pzM0L7x6h9ljju9Pw89FZMKlrVfjvnJ6gnIv/DTd4jC+iRxMowVKrUa1IuirbjmflCr9tfxaWYY0Cpm/onQNmXzUmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767267; 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=dMUrGYaXj57wNpnA0w6q9bLXFd5atbwEdcL2T2cI6lg=; b=NShVqbJBVGjxT8t4fKepZSDOL7YC3eC/NjtEJXBgUTPPNMBeO6mziYaieDGpCAbendI9fqHBE+dWCRXVnomKaqK/obO4B9Wt4m28ILUuPo0U//oQ8mCOtl2SECot0550j110S4LDPol+1xzrePY7SZk0lu7iukptcmFiiHybdJQ= 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 1585767267590126.65997102137362; Wed, 1 Apr 2020 11:54:27 -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-194-2kkplHHiPuqJRfWkv81Y9g-1; Wed, 01 Apr 2020 14:54:24 -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 411A010CE78E; Wed, 1 Apr 2020 18:54:18 +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 103FA196AE; Wed, 1 Apr 2020 18:54:18 +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 B04CD18089CE; Wed, 1 Apr 2020 18:54:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031IrxPY027819 for ; Wed, 1 Apr 2020 14:53:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5116999E05; Wed, 1 Apr 2020 18:53:59 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 454E899DFD for ; Wed, 1 Apr 2020 18:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767266; 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=dMUrGYaXj57wNpnA0w6q9bLXFd5atbwEdcL2T2cI6lg=; b=a8UVojrdRIWN+WRH3y94oWFnikAAfFtFspylXW91ApfP24AsSHNqcxfBjbFv+IJUbwXbXM cdJY8QCGTaseEsMMzGZpLuw3jq/IDBFzC4uVj7iNoOsUgW7PFrnO6ENturYTvsHNxtDvDH 8KmeRWYtR3zJEtaaIOIbM5gFhiaoOaA= X-MC-Unique: 2kkplHHiPuqJRfWkv81Y9g-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/8] logging, locking: Set default timeout of 120 seconds Date: Wed, 1 Apr 2020 20:53:41 +0200 Message-Id: <20200401185345.248398-5-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" This is consistent with what is already done for all other daemons. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- src/locking/virtlockd.service.in | 2 +- src/logging/virtlogd.service.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index e7f8057c06..dc43f771cd 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -8,7 +8,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlockd -ExecStart=3D@sbindir@/virtlockd $VIRTLOCKD_ARGS +ExecStart=3D@sbindir@/virtlockd --timeout 120 $VIRTLOCKD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID # Loosing the locks is a really bad thing that will # cause the machine to be fenced (rebooted), so make diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index daff48e67d..7ad9545581 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -8,7 +8,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlogd -ExecStart=3D@sbindir@/virtlogd $VIRTLOGD_ARGS +ExecStart=3D@sbindir@/virtlogd --timeout 120 $VIRTLOGD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID # Loosing the logs is a really bad thing that will # cause the machine to be fenced (rebooted), so make --=20 2.25.1 From nobody Wed May 15 23:52:49 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=1585767264; cv=none; d=zohomail.com; s=zohoarc; b=j5uvh6gEL/1xLJ4MBe9Jlh1CTxo9EPfF6YdI+Ycxe8Shgm43y/HwVv8ZanhULd6KBa/ABHxHf2CW79YnTwkmDzrp/g21GtkOXH5ry3b+yZKUasbj5UnL1AJxJDjfPsQ41sAbHVtsTNfCELD+HVvrPOS5Fo5dRrnasQWuOkNttiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767264; 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=QEjKWA2YsJ7nSS3HpJVfRN5GYwSNtBtU3DGPO0IfVw8=; b=WQjyDKbpHVGRRdAn6lCwFjfewbPlanG+JEGVGtjng3SSlwRwAwPSgW5pvowvQZqWKiB04wv5Q5+i0rwt5UaKzEEa02g3+ryGIP9o6MJBfbOEajMTtsllJU0ZDq09x2n1BT6/PX1JfmWC3DB9X9wBK4hVsqKFhgtWB+HSVh622/c= 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 1585767264506469.04596981530426; Wed, 1 Apr 2020 11:54:24 -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-373-_SIUG-X-M7iirR923HDpzw-1; Wed, 01 Apr 2020 14:54: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 B2342DBAA; Wed, 1 Apr 2020 18:54:13 +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 6EF585DA83; Wed, 1 Apr 2020 18:54:13 +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 F38268B2AE; Wed, 1 Apr 2020 18:54:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031Is1XX027826 for ; Wed, 1 Apr 2020 14:54:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B84199DE4; Wed, 1 Apr 2020 18:54:01 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E520099DFD for ; Wed, 1 Apr 2020 18:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767263; 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=QEjKWA2YsJ7nSS3HpJVfRN5GYwSNtBtU3DGPO0IfVw8=; b=Nyya6RUQYdOi6ItdA6v9AQaXnVzlNKZznzGjq/uypHrXhIq6avELE8yT6ABm0burHu2mTD MpLWD97xVUr1KxDceHroIzkz0MjJNy4/rqFgj/ES8woK0jofkSdicAT3JYEAlYpxb9Zcfy qC9nV4MR7gIuzzNGFWnAc8kCSMQv9IA= X-MC-Unique: _SIUG-X-M7iirR923HDpzw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 5/8] Add sysconf files for all daemons Date: Wed, 1 Apr 2020 20:53:42 +0200 Message-Id: <20200401185345.248398-6-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" While not terribly useful in general, turning off each daemon's timeout is a valid use case which we can very easily support while being consistent with what already happens for libvirtd, virtlogd and virtlockd. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- 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 +++ 36 files changed, 86 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/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..fb34143d7d --- /dev/null +++ b/src/interface/virtinterfaced.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtinterfaced +#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..878d333411 --- /dev/null +++ b/src/libxl/virtxend.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtxend +#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..50d1d31540 --- /dev/null +++ b/src/lxc/virtlxcd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtlxcd +#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..c2a9eb6767 --- /dev/null +++ b/src/network/virtnetworkd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtnetworkd +#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..6095bb6c94 --- /dev/null +++ b/src/node_device/virtnodedevd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtnodedevd +#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..704dc57a16 --- /dev/null +++ b/src/nwfilter/virtnwfilterd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtnwfilterd +#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..53d9de7a20 --- /dev/null +++ b/src/qemu/virtqemud.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtqemud +#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..3cb64bdb4e --- /dev/null +++ b/src/remote/virtproxyd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtproxyd +#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..6e89f38099 --- /dev/null +++ b/src/secret/virtsecretd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtsecretd +#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..99c42e7958 --- /dev/null +++ b/src/storage/virtstoraged.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtstoraged +#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..0b3205710b --- /dev/null +++ b/src/vbox/virtvboxd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtvboxd +#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..536125b2d5 --- /dev/null +++ b/src/vz/virtvzd.sysconf @@ -0,0 +1,3 @@ +# +# Pass extra arguments to virtvzd +#VIRTVZD_ARGS=3D --=20 2.25.1 From nobody Wed May 15 23:52:49 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=1585767304; cv=none; d=zohomail.com; s=zohoarc; b=HulVVK3g6Ap7Zbz+ma7KWpXv9bF22FUO1v37j1d7WTtMpAGdma+V5NjdL86Xaysq3PKqm6aY3mPPhC2qoW8rTALf+/dLoh1aaPsTuGGy9uwdpRQqmCBi9GAW64az/4Bat//AjuhP4zVkV+EO76grjFuYkEr+GFqy3xOxk003Tnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767304; 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=4cBQkQXiqPbVJMfRL8FwvOWP4HlcmnmzwwntkfDT8mc=; b=bkxtUECTit3rLoAh2I0qmNMJAlvfB0iZAPjeI4uSA3KXBvgGhRm1Sk0Q4aeaZJydIm1bXUnkriF+46yaNOUm4xTSN1mw3dJYozS1i9EX3NvZqf3IlvXOMdbcC+UvXC8oyO7jhM/99bpczvP95B9KyP7Mq3K3126m/cPkqLsK0qQ= 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 1585767304555576.8328077568782; Wed, 1 Apr 2020 11:55:04 -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-284-hSD75BcxOsq2WstTlIUqzA-1; Wed, 01 Apr 2020 14:54:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8B9218A6EC4; Wed, 1 Apr 2020 18:54:21 +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 BB6D560C99; Wed, 1 Apr 2020 18:54:21 +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 73A9318089D8; Wed, 1 Apr 2020 18:54:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031Is4UM027850 for ; Wed, 1 Apr 2020 14:54:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8FAA899DF8; Wed, 1 Apr 2020 18:54:04 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86FB499DE4 for ; Wed, 1 Apr 2020 18:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767303; 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=4cBQkQXiqPbVJMfRL8FwvOWP4HlcmnmzwwntkfDT8mc=; b=aUBj6qO0dMCTct+mdTPHupZyJf9NuDG3fdA9kctYUpLdb34C2B3ecyc2dRliNsYnWnlb/x 1z8OuE7nyDj/ms3XsC6gjrzR9b8l6w9WSha9PfYSjROpG34ui+v8Ro4Dchvel38m56VN/2 cyfKyiTShn9vkrtYU7dq/a0muKaSq6c= X-MC-Unique: hSD75BcxOsq2WstTlIUqzA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 6/8] spec: Include new sysconf files Date: Wed, 1 Apr 2020 20:53:43 +0200 Message-Id: <20200401185345.248398-7-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.12 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" Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- libvirt.spec.in | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 --=20 2.25.1 From nobody Wed May 15 23:52:49 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=1585767507; cv=none; d=zohomail.com; s=zohoarc; b=M++0kBr07LKFTmS/MmtsZSpxS357z/VsKi9dlKy/Bpk9GEpt0kxpF8W11uyjthHKdSWfh9KT00VV+BEofzuP7MTAexB2leIwvZTGrvJeq/jJBbTe+/zhDwyfyKV7Z0RIRK5hFNhfmKWG+cKRgNw8JNphBB+7a71DTdTs8kB6Jmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767507; 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=b1B1OcbGS1sW4Svacp7tPpsttpI46HECNDQYqytcV3M=; b=g39OBJjJfs4nHP+IYL61lKvNsoj50ai5mDTlTWJDriUYbJztG3K3xirj0GdUiRpPtxw4zozejTld/3DiTdzaeXYBHIslPEVNcYczW+34NyoAoPicDDvEK+ji5HkdsSJln2cVMgfkxquc0EmlLP7TT98IL5cusSLwliWJKymyWNg= 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 1585767507234207.2448641505381; Wed, 1 Apr 2020 11:58:27 -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-317-3QWoM4waMJG2OBfpOWLDmw-1; Wed, 01 Apr 2020 14:58:23 -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 6E7938017FB; Wed, 1 Apr 2020 18:58:17 +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 426C396B93; Wed, 1 Apr 2020 18:58:17 +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 E566418034EC; Wed, 1 Apr 2020 18:58:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031Is7Js027877 for ; Wed, 1 Apr 2020 14:54:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 604DC96F83; Wed, 1 Apr 2020 18:54:07 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6840C9A240 for ; Wed, 1 Apr 2020 18:54:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767505; 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=b1B1OcbGS1sW4Svacp7tPpsttpI46HECNDQYqytcV3M=; b=di4//IIinC94yrXnzxi7GiFHIZouitVDHtYYky4p9A22vWJ+TNal9zSyXSoJSmRmW0Ra+6 lGCqtZk4N1CKVd3sILffUv5lj/t3cB3HsCJDJg9w9QS3KgvPU0/GdBDzkFxHpCNvuDopsr MpZtxDY2ik5Su/s0DBQEAqEJSkMSBQE= X-MC-Unique: 3QWoM4waMJG2OBfpOWLDmw-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 7/8] qemu: Allow audio driver override in virtqemud Date: Wed, 1 Apr 2020 20:53:44 +0200 Message-Id: <20200401185345.248398-8-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 --- src/qemu/virtqemud.sysconf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf index 53d9de7a20..50816be594 100644 --- a/src/qemu/virtqemud.sysconf +++ b/src/qemu/virtqemud.sysconf @@ -1,3 +1,12 @@ # # Pass extra arguments to virtqemud #VIRTQEMUD_ARGS=3D + +# 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 Wed May 15 23:52:49 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=1585767267; cv=none; d=zohomail.com; s=zohoarc; b=ItE4U+G6hZJbcTAMs8P/W3DrCfm0IxHjuGSNWgUw9rKppyEdCJl4f0NwbeRdIh+qvHTQ/syysKlgWmRgIaGdeR8FARxLW+/frf0brMmD9KbBEUdLB0/awr1lVHboNSBMf2pwac7n4U/oJPMSta5eZH+T9HiFxetaNqisZCybfrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585767267; 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=cyAKWZr9xXyEYMhbV5K7e24LJtXdd1GbVZNpQbifFHY=; b=Rpa/J1FFjOnWlHabWxSrWqhCjk4q9UitbCmoPfT0gx0zZ+V27kouhOhWaT8lD0jGjAloY5iOWdUFonOjRn0kyona3bsBh6uUjkklLgVIU+uXzwYeo63OKAueCOsDpMxBhoU7aePh59TB87LSdYqTQVr0eHbihtUdjNvsrMElvm0= 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1585767267647642.3206853794162; Wed, 1 Apr 2020 11:54:27 -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-457-SGfhFQltMP6GYN04YTY2EQ-1; Wed, 01 Apr 2020 14:54:24 -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 20F448024CD; Wed, 1 Apr 2020 18:54:18 +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 DF73010002D0; Wed, 1 Apr 2020 18:54:17 +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 87B9318089C8; Wed, 1 Apr 2020 18:54:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 031IsDwk027913 for ; Wed, 1 Apr 2020 14:54:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id A3C1099DFA; Wed, 1 Apr 2020 18:54:13 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D34799DE4 for ; Wed, 1 Apr 2020 18:54:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585767266; 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=cyAKWZr9xXyEYMhbV5K7e24LJtXdd1GbVZNpQbifFHY=; b=iAHQLvoB/g8fJU9P8BUL0JckSSJLgaKXU4d6wCaBMuQidhpvKz4KBSkLyoVlNC7vNPlr3Y PQ86w7iKU0dksFVITogwvhe+bYkodZ3siwqXmNTw73QRAb1CUkJr439/6Huy3748c5lf4J jR/Ur3DixkTB62OaBO3XFusufE2fQZE= X-MC-Unique: SGfhFQltMP6GYN04YTY2EQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 8/8] remote: Drop KRB5_KTNAME override Date: Wed, 1 Apr 2020 20:53:45 +0200 Message-Id: <20200401185345.248398-9-abologna@redhat.com> In-Reply-To: <20200401185345.248398-1-abologna@redhat.com> References: <20200401185345.248398-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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" 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 sever 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 --- src/remote/libvirtd.sasl | 4 +--- src/remote/libvirtd.sysconf | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) 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 5969518bf2..e1aec32c1b 100644 --- a/src/remote/libvirtd.sysconf +++ b/src/remote/libvirtd.sysconf @@ -5,9 +5,6 @@ # NB. must setup TLS/SSL keys prior to using this #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 # --=20 2.25.1