From nobody Thu Apr 25 01:46:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1641984332887346.6793535341412; Wed, 12 Jan 2022 02:45:32 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-341-xeWj5Z6HO02M5d40w0YraA-1; Wed, 12 Jan 2022 05:45:28 -0500 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 DD7FD760C0; Wed, 12 Jan 2022 10:45:22 +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 1EF97752DF; Wed, 12 Jan 2022 10:45:22 +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 3754D4BB7B; Wed, 12 Jan 2022 10:45:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20CAjG2Q025153 for ; Wed, 12 Jan 2022 05:45:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id CC7A51410DD6; Wed, 12 Jan 2022 10:45:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C62F9140EBFD for ; Wed, 12 Jan 2022 10:45:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A322D3C021B8 for ; Wed, 12 Jan 2022 10:45:16 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.216]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-15-rAwS7tWXNrCFykxUHNGPXQ-1; Wed, 12 Jan 2022 05:45:14 -0500 Received: from sender by smtp.strato.de (RZmta 47.37.6 AUTH) with ESMTPSA id k3f463y0CAjCPEh (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 12 Jan 2022 11:45:12 +0100 (CET) X-MC-Unique: xeWj5Z6HO02M5d40w0YraA-1 X-MC-Unique: rAwS7tWXNrCFykxUHNGPXQ-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAgs09Vb1Rctxqmb8LO1WiVVKPbQ0XYaidf48W08=" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v8 1/2] remove sysconfig files Date: Wed, 12 Jan 2022 11:45:08 +0100 Message-Id: <20220112104509.32689-2-olaf@aepfle.de> In-Reply-To: <20220112104509.32689-1-olaf@aepfle.de> References: <20220112104509.32689-1-olaf@aepfle.de> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-loop: libvir-list@redhat.com Cc: Olaf Hering 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1641984335098100004 Content-Type: text/plain; charset="utf-8" sysconfig files are owned by the admin of the host. They have the liberty to put anything they want into these files. This makes it difficult to provide different built-in defaults. Remove the sysconfig file and place the current desired default into the service file. Local customizations can now go either into /etc/sysconfig/name or /etc/systemd/system/name.service.d/my-knobs.conf Attempt to handle upgrades in libvirt.spec. Dirty files which are marked as %config will be renamed to file.rpmsave. To restore them automatically, move stale .rpmsave files away, and catch any new rpmsave files in %posttrans. Signed-off-by: Olaf Hering Reviewed-by: Andrea Bolognani --- docs/daemons.rst | 21 ++++++++ docs/remote.html.in | 6 +-- libvirt.spec.in | 69 +++++++++++++++++++------ src/ch/meson.build | 5 -- src/ch/virtchd.service.in | 1 + src/ch/virtchd.sysconf | 3 -- src/interface/meson.build | 5 -- src/interface/virtinterfaced.service.in | 1 + src/interface/virtinterfaced.sysconf | 3 -- src/libxl/meson.build | 5 -- src/libxl/virtxend.service.in | 1 + src/libxl/virtxend.sysconf | 3 -- src/locking/meson.build | 5 -- src/locking/virtlockd.service.in | 1 + src/locking/virtlockd.sysconf | 3 -- src/logging/meson.build | 5 -- src/logging/virtlogd.sysconf | 3 -- src/lxc/meson.build | 5 -- src/lxc/virtlxcd.service.in | 1 + src/lxc/virtlxcd.sysconf | 3 -- src/meson.build | 16 ------ src/network/meson.build | 5 -- src/network/virtnetworkd.service.in | 1 + src/network/virtnetworkd.sysconf | 3 -- src/node_device/meson.build | 5 -- src/node_device/virtnodedevd.service.in | 1 + src/node_device/virtnodedevd.sysconf | 3 -- src/nwfilter/meson.build | 5 -- src/nwfilter/virtnwfilterd.service.in | 1 + src/nwfilter/virtnwfilterd.sysconf | 3 -- src/qemu/meson.build | 5 -- src/qemu/virtqemud.service.in | 1 + src/qemu/virtqemud.sysconf | 12 ----- src/remote/libvirtd.service.in | 1 + src/remote/libvirtd.sysconf | 21 -------- src/remote/meson.build | 10 ---- src/remote/virtproxyd.service.in | 1 + src/remote/virtproxyd.sysconf | 3 -- src/secret/meson.build | 5 -- src/secret/virtsecretd.service.in | 1 + src/secret/virtsecretd.sysconf | 3 -- src/storage/meson.build | 5 -- src/storage/virtstoraged.service.in | 1 + src/storage/virtstoraged.sysconf | 3 -- src/vbox/meson.build | 5 -- src/vbox/virtvboxd.service.in | 1 + src/vbox/virtvboxd.sysconf | 3 -- src/vz/meson.build | 5 -- src/vz/virtvzd.service.in | 1 + src/vz/virtvzd.sysconf | 3 -- tools/libvirt-guests.sysconf | 50 ------------------ tools/meson.build | 6 --- 52 files changed, 93 insertions(+), 245 deletions(-) delete mode 100644 src/ch/virtchd.sysconf delete mode 100644 src/interface/virtinterfaced.sysconf delete mode 100644 src/libxl/virtxend.sysconf delete mode 100644 src/locking/virtlockd.sysconf delete mode 100644 src/logging/virtlogd.sysconf delete mode 100644 src/lxc/virtlxcd.sysconf delete mode 100644 src/network/virtnetworkd.sysconf delete mode 100644 src/node_device/virtnodedevd.sysconf delete mode 100644 src/nwfilter/virtnwfilterd.sysconf delete mode 100644 src/qemu/virtqemud.sysconf delete mode 100644 src/remote/libvirtd.sysconf delete mode 100644 src/remote/virtproxyd.sysconf delete mode 100644 src/secret/virtsecretd.sysconf delete mode 100644 src/storage/virtstoraged.sysconf delete mode 100644 src/vbox/virtvboxd.sysconf delete mode 100644 src/vz/virtvzd.sysconf delete mode 100644 tools/libvirt-guests.sysconf diff --git a/docs/daemons.rst b/docs/daemons.rst index c8ae3b0cef..1f9bc34260 100644 --- a/docs/daemons.rst +++ b/docs/daemons.rst @@ -686,3 +686,24 @@ socket unit names into the service. When using these o= ld versions, the ``unix_sock_dir`` setting in ``virtlockd.conf`` must be changed in lock-step with the equivalent setting in the unit files to ensure that ``virtlockd`` can identify the sockets. + +Changing command line options for daemons +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Two ways exist to override the defaults in the provided service files: +either a systemd "drop-in" configuration file, or a ``/etc/sysconfig/$daem= on`` +file must be created. For example, to change the command line option +for a debug session of ``libvirtd``, create a file +``/etc/systemd/system/libvirtd.service.d/debug.conf`` with the following c= ontent: + + :: + + [Unit] + Description=3DVirtualization daemon, with override from debug.conf + + [Service] + Environment=3DG_DEBUG=3Dfatal-warnings + Environment=3DLIBVIRTD_ARGS=3D"--listen --verbose" + +After changes to systemd "drop-in" configuration files it is required to r= un +``systemctl daemon-reload``. diff --git a/docs/remote.html.in b/docs/remote.html.in index efdb2b3253..47fb2d4df3 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -138,9 +138,9 @@ Blank lines and comments beginning with # = are ignored. 1 (on) Listen for secure TLS connections on the public TCP/IP port. - Note: it is also necessary to start the server in listening mode by - running it with --listen or editing /etc/sysconfig/libvirtd by uncomment= ing the LIBVIRTD_ARGS=3D"--listen" line - to cause the server to come up in listening mode whenever it is started. + Note: it is also necessary to start the server in listening mode + by running it with --listen or adding a LIBVIRTD_ARGS=3D"--listen" + line to /etc/sysconfig/libvirtd. diff --git a/libvirt.spec.in b/libvirt.spec.in index 7a90a1a9e6..81ec289e6c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -206,6 +206,24 @@ =20 %define tls_priority "@LIBVIRT,SYSTEM" =20 +# libvirt 8.0.0 stops distributing any sysconfig files. +# If the user has customized their sysconfig file, +# the RPM upgrade path will rename it to .rpmsave +# because the file is no longer managed by RPM. +# To prevent a regression we rename it back after the +# transaction to preserve the user's modifications +%define libvirt_sysconfig_pre() \ + for sc in %{?*} ; do \ + test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \ + mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sys= config/${sc}.rpmsave.old" ; \ + done \ + %{nil} +%define libvirt_sysconfig_posttrans() \ + for sc in %{?*} ; do \ + test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \ + mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sys= config/${sc}" ; \ + done \ + %{nil} =20 Summary: Library providing a simple virtualization API Name: libvirt @@ -1286,6 +1304,7 @@ fi \ %define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-a= dmin.socket %1.socket =20 %pre daemon +%libvirt_sysconfig_pre libvirtd virtproxyd virtlogd virtlockd libvirt-gues= ts # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation # described at the above link. @@ -1334,6 +1353,7 @@ if [ $1 -ge 1 ] ; then fi =20 %posttrans daemon +%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvir= t-guests if test %libvirt_daemon_needs_restart libvirtd then # See if user has previously modified their install to @@ -1374,6 +1394,9 @@ fi =20 %libvirt_daemon_finish_restart libvirtd =20 +%pre daemon-driver-network +%libvirt_sysconfig_pre virtnetworkd + %post daemon-driver-network %if %{with_firewalld_zone} %firewalld_reload @@ -1393,8 +1416,11 @@ fi %endif =20 %posttrans daemon-driver-network +%libvirt_sysconfig_posttrans virtnetworkd %libvirt_daemon_perform_restart virtnetworkd =20 +%pre daemon-driver-nwfilter +%libvirt_sysconfig_pre virtnwfilterd =20 %post daemon-driver-nwfilter %if %{with_modular_daemons} @@ -1406,8 +1432,11 @@ fi %libvirt_daemon_systemd_preun virtnwfilterd =20 %posttrans daemon-driver-nwfilter +%libvirt_sysconfig_posttrans virtnwfilterd %libvirt_daemon_perform_restart virtnwfilterd =20 +%pre daemon-driver-nodedev +%libvirt_sysconfig_pre virtnodedevd =20 %post daemon-driver-nodedev %if %{with_modular_daemons} @@ -1419,8 +1448,11 @@ fi %libvirt_daemon_systemd_preun virtnodedevd =20 %posttrans daemon-driver-nodedev +%libvirt_sysconfig_posttrans virtnodedevd %libvirt_daemon_perform_restart virtnodedevd =20 +%pre daemon-driver-interface +%libvirt_sysconfig_pre virtinterfaced =20 %post daemon-driver-interface %if %{with_modular_daemons} @@ -1432,8 +1464,11 @@ fi %libvirt_daemon_systemd_preun virtinterfaced =20 %posttrans daemon-driver-interface +%libvirt_sysconfig_posttrans virtinterfaced %libvirt_daemon_perform_restart virtinterfaced =20 +%pre daemon-driver-secret +%libvirt_sysconfig_pre virtsecretd =20 %post daemon-driver-secret %if %{with_modular_daemons} @@ -1445,9 +1480,13 @@ fi %libvirt_daemon_systemd_preun virtsecretd =20 %posttrans daemon-driver-secret +%libvirt_sysconfig_posttrans virtsecretd %libvirt_daemon_perform_restart virtsecretd =20 =20 +%pre daemon-driver-storage +%libvirt_sysconfig_pre virtstoraged + %post daemon-driver-storage %if %{with_modular_daemons} %libvirt_daemon_systemd_post virtstoraged @@ -1458,11 +1497,13 @@ fi %libvirt_daemon_systemd_preun virtstoraged =20 %posttrans daemon-driver-storage +%libvirt_sysconfig_posttrans virtstoraged %libvirt_daemon_perform_restart virtstoraged =20 =20 %if %{with_qemu} %pre daemon-driver-qemu +%libvirt_sysconfig_pre virtqemud # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups @@ -1487,11 +1528,15 @@ exit 0 %libvirt_daemon_systemd_preun virtqemud =20 %posttrans daemon-driver-qemu +%libvirt_sysconfig_posttrans virtqemud %libvirt_daemon_perform_restart virtqemud %endif =20 =20 %if %{with_lxc} +%pre daemon-driver-lxc +%libvirt_sysconfig_pre virtlxcd + %post daemon-driver-lxc %if %{with_modular_daemons} %libvirt_daemon_systemd_post virtlxcd @@ -1502,6 +1547,7 @@ exit 0 %libvirt_daemon_systemd_preun virtlxcd =20 %posttrans daemon-driver-lxc +%libvirt_sysconfig_posttrans virtlxcd %libvirt_daemon_perform_restart virtlxcd %endif =20 @@ -1513,10 +1559,14 @@ exit 0 %endif %libvirt_daemon_schedule_restart virtvboxd =20 +%pre daemon-driver-vbox +%libvirt_sysconfig_pre virtvboxd + %preun daemon-driver-vbox %libvirt_daemon_systemd_preun virtvboxd =20 %posttrans daemon-driver-vbox +%libvirt_sysconfig_posttrans virtvboxd %libvirt_daemon_perform_restart virtvboxd %endif =20 @@ -1528,10 +1578,14 @@ exit 0 %endif %libvirt_daemon_schedule_restart virtxend =20 +%pre daemon-driver-libxl +%libvirt_sysconfig_pre virtxend + %preun daemon-driver-libxl %libvirt_daemon_systemd_preun virtxend =20 %posttrans daemon-driver-libxl +%libvirt_sysconfig_posttrans virtxend %libvirt_daemon_perform_restart virtxend %endif =20 @@ -1634,16 +1688,11 @@ exit 0 %{_unitdir}/virtlockd.socket %{_unitdir}/virtlockd-admin.socket %{_unitdir}/libvirt-guests.service -%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 %config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf =20 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -1716,7 +1765,6 @@ 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 @@ -1729,7 +1777,6 @@ exit 0 %{_mandir}/man8/virtinterfaced.8* =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 @@ -1753,7 +1800,6 @@ 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 @@ -1766,7 +1812,6 @@ exit 0 %{_mandir}/man8/virtnodedevd.8* =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 @@ -1781,7 +1826,6 @@ exit 0 %{_mandir}/man8/virtnwfilterd.8* =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 @@ -1796,7 +1840,6 @@ 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 @@ -1854,7 +1897,6 @@ exit 0 =20 %if %{with_qemu} %files daemon-driver-qemu -%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf %{_datadir}/augeas/lenses/virtqemud.aug @@ -1884,7 +1926,6 @@ 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 @@ -1907,7 +1948,6 @@ 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 @@ -1930,7 +1970,6 @@ 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/ch/meson.build b/src/ch/meson.build index e0afdb390a..a4bf0c6649 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -63,11 +63,6 @@ if conf.has('WITH_CH') 'sockets': [ 'main', 'ro', 'admin' ], } =20 - sysconf_files +=3D { - 'name': 'virtchd', - 'file': files('virtchd.sysconf'), - } - virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'ch', runstatedir / 'libvirt' / 'ch', diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in index cc1e85d1df..f08339f211 100644 --- a/src/ch/virtchd.service.in +++ b/src/ch/virtchd.service.in @@ -18,6 +18,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTCHD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtchd ExecStart=3D@sbindir@/virtchd $VIRTCHD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/ch/virtchd.sysconf b/src/ch/virtchd.sysconf deleted file mode 100644 index 5ee44be5cf..0000000000 --- a/src/ch/virtchd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtchd.service systemd unit - -VIRTCHD_ARGS=3D"--timeout 120" diff --git a/src/interface/meson.build b/src/interface/meson.build index 2d4e30362c..f9f378aeb0 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -54,9 +54,4 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'in_file': files('virtinterfaced.init.in') } - - sysconf_files +=3D { - 'name': 'virtinterfaced', - 'file': files('virtinterfaced.sysconf'), - } endif diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin= terfaced.service.in index 73d409b81b..3d944e17a9 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -13,6 +13,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTINTERFACED_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtinterfaced ExecStart=3D@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinter= faced.sysconf deleted file mode 100644 index 0685da31b8..0000000000 --- a/src/interface/virtinterfaced.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtinterfaced.service systemd unit - -VIRTINTERFACED_ARGS=3D"--timeout 120" diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 9793899106..8347a3c966 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -78,11 +78,6 @@ if conf.has('WITH_LIBXL') 'in_file': files('virtxend.init.in'), } =20 - sysconf_files +=3D { - 'name': 'virtxend', - 'file': files('virtxend.sysconf'), - } - virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'libxl', runstatedir / 'libvirt' / 'libxl', diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 19b19ce3e6..2b5163e179 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -18,6 +18,7 @@ ConditionPathExists=3D/proc/xen/capabilities =20 [Service] Type=3Dnotify +Environment=3DVIRTXEND_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtxend ExecStart=3D@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf deleted file mode 100644 index 301da47e8d..0000000000 --- a/src/libxl/virtxend.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtxend.service systemd unit - -VIRTXEND_ARGS=3D"--timeout 120" diff --git a/src/locking/meson.build b/src/locking/meson.build index 184d3c3f56..72f7780438 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -156,11 +156,6 @@ if conf.has('WITH_LIBVIRTD') 'in_file': files('virtlockd.init.in'), } =20 - sysconf_files +=3D { - 'name': 'virtlockd', - 'file': files('virtlockd.sysconf'), - } - if conf.has('WITH_SANLOCK') virt_helpers +=3D { 'name': 'libvirt_sanlock_helper', diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 4a6fab05ab..19271d1e7d 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -7,6 +7,7 @@ Documentation=3Dman:virtlockd(8) Documentation=3Dhttps://libvirt.org =20 [Service] +Environment=3DVIRTLOCKD_ARGS=3D EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlockd ExecStart=3D@sbindir@/virtlockd $VIRTLOCKD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID diff --git a/src/locking/virtlockd.sysconf b/src/locking/virtlockd.sysconf deleted file mode 100644 index 03aea9e1bc..0000000000 --- a/src/locking/virtlockd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtlockd.service systemd unit - -VIRTLOCKD_ARGS=3D"" diff --git a/src/logging/meson.build b/src/logging/meson.build index 89e06a0d5a..7066f16fad 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -101,11 +101,6 @@ if conf.has('WITH_LIBVIRTD') 'name': 'virtlogd', 'in_file': files('virtlogd.init.in'), } - - sysconf_files +=3D { - 'name': 'virtlogd', - 'file': files('virtlogd.sysconf'), - } endif =20 log_inc_dir =3D include_directories('.') diff --git a/src/logging/virtlogd.sysconf b/src/logging/virtlogd.sysconf deleted file mode 100644 index 67993e83ce..0000000000 --- a/src/logging/virtlogd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtlogd.service systemd unit - -VIRTLOGD_ARGS=3D"" diff --git a/src/lxc/meson.build b/src/lxc/meson.build index ad5c659dba..c1f71b43e1 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -175,11 +175,6 @@ if conf.has('WITH_LXC') 'in_file': files('virtlxcd.init.in'), } =20 - sysconf_files +=3D { - 'name': 'virtlxcd', - 'file': files('virtlxcd.sysconf'), - } - virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'lxc', runstatedir / 'libvirt' / 'lxc', diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 3af7c1a52d..d58bde9f5d 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -18,6 +18,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTLXCD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlxcd ExecStart=3D@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf deleted file mode 100644 index 119a4a23f3..0000000000 --- a/src/lxc/virtlxcd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtlxcd.service systemd unit - -VIRTLXCD_ARGS=3D"--timeout 120" diff --git a/src/meson.build b/src/meson.build index 2408344ef7..fc6c77f5d1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -208,12 +208,6 @@ virt_daemon_units =3D [] # * in_file - source init file (required) openrc_init_files =3D [] =20 -# sysconf_files -# install libvirt daemon sysconf files -# * name - daemon name (required) -# * file - source sysconf file (required) -sysconf_files =3D [] - # virt_install_dirs: # list of directories to create during installation virt_install_dirs =3D [] @@ -868,16 +862,6 @@ if conf.has('WITH_LIBVIRTD') endif endif =20 -if init_script !=3D 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], - install_dir: sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -endif - if conf.has('WITH_DTRACE_PROBES') custom_target( 'libvirt_functions.stp', diff --git a/src/network/meson.build b/src/network/meson.build index d6fb624bb7..e7c43bc4c4 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -72,11 +72,6 @@ if conf.has('WITH_NETWORK') 'in_file': files('virtnetworkd.init.in'), } =20 - sysconf_files +=3D { - 'name': 'virtnetworkd', - 'file': files('virtnetworkd.sysconf'), - } - virt_install_dirs +=3D [ localstatedir / 'lib' / 'libvirt' / 'network', localstatedir / 'lib' / 'libvirt' / 'dnsmasq', diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd= .service.in index 4c39d2a5d7..3decfbbf1d 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -16,6 +16,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTNETWORKD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnetworkd ExecStart=3D@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sy= sconf deleted file mode 100644 index 93f3a7a327..0000000000 --- a/src/network/virtnetworkd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtnetworkd.service systemd unit - -VIRTNETWORKD_ARGS=3D"--timeout 120" diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 15f9c3ad29..5013d825b3 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -62,9 +62,4 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'virtnodedevd', 'in_file': files('virtnodedevd.init.in'), } - - sysconf_files +=3D { - 'name': 'virtnodedevd', - 'file': files('virtnodedevd.sysconf'), - } endif diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt= nodedevd.service.in index d2453dd620..688cf89822 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -13,6 +13,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTNODEDEVD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnodedevd ExecStart=3D@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnod= edevd.sysconf deleted file mode 100644 index fa7faa3a79..0000000000 --- a/src/node_device/virtnodedevd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtnodedevd.service systemd unit - -VIRTNODEDEVD_ARGS=3D"--timeout 120" diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index a21e575925..ebbe712906 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -61,10 +61,5 @@ if conf.has('WITH_NWFILTER') 'in_file': files('virtnwfilterd.init.in'), } =20 - sysconf_files +=3D { - 'name': 'virtnwfilterd', - 'file': files('virtnwfilterd.sysconf'), - } - subdir('xml') endif diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil= terd.service.in index dda7c01a3d..36d00b58f0 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -13,6 +13,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTNWFILTERD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnwfilterd ExecStart=3D@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilter= d.sysconf deleted file mode 100644 index 80cc645ba5..0000000000 --- a/src/nwfilter/virtnwfilterd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtnwfilterd.service systemd unit - -VIRTNWFILTERD_ARGS=3D"--timeout 120" diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 66ef594006..5f82f687c1 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -165,11 +165,6 @@ if conf.has('WITH_QEMU') 'in_file': files('virtqemud.init.in'), } =20 - sysconf_files +=3D { - 'name': 'virtqemud', - 'file': files('virtqemud.sysconf'), - } - if conf.has('WITH_SYSCTL') install_data( 'postcopy-migration.sysctl', diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 20e1b43a6e..551eb4d405 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -20,6 +20,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTQEMUD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtqemud ExecStart=3D@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf deleted file mode 100644 index 87b626e3ed..0000000000 --- a/src/qemu/virtqemud.sysconf +++ /dev/null @@ -1,12 +0,0 @@ -# Customizations for the virtqemud.service systemd unit - -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 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index cc0d4e3693..5d4d412fcc 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -28,6 +28,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DLIBVIRTD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirtd ExecStart=3D@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/remote/libvirtd.sysconf b/src/remote/libvirtd.sysconf deleted file mode 100644 index 18aec1ba67..0000000000 --- a/src/remote/libvirtd.sysconf +++ /dev/null @@ -1,21 +0,0 @@ -# Customizations for the libvirtd.service systemd unit - -# 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 -#LIBVIRTD_ARGS=3D"--listen" - -# 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 diff --git a/src/remote/meson.build b/src/remote/meson.build index 0a188268b5..fc98d0e5be 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -204,11 +204,6 @@ if conf.has('WITH_REMOTE') 'confd': files('libvirtd.confd'), } =20 - sysconf_files +=3D { - 'name': 'libvirtd', - 'file': files('libvirtd.sysconf'), - } - virt_daemons +=3D { 'name': 'virtproxyd', 'c_args': [ @@ -239,11 +234,6 @@ if conf.has('WITH_REMOTE') 'confd': files('virtproxyd.confd'), } =20 - sysconf_files +=3D { - 'name': 'virtproxyd', - 'file': files('virtproxyd.sysconf'), - } - virt_install_dirs +=3D [ localstatedir / 'log' / 'libvirt', ] diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in index f43ce9ee6e..10e8cf7263 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -13,6 +13,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTPROXYD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtproxyd ExecStart=3D@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf deleted file mode 100644 index 0fc5c61096..0000000000 --- a/src/remote/virtproxyd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtproxyd.service systemd unit - -VIRTPROXYD_ARGS=3D"--timeout 120" diff --git a/src/secret/meson.build b/src/secret/meson.build index a487055cde..efc0ebb1e6 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -43,9 +43,4 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', 'in_file': files('virtsecretd.init.in'), } - - sysconf_files +=3D { - 'name': 'virtsecretd', - 'file': files('virtsecretd.sysconf'), - } endif diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser= vice.in index 8444142a3a..cbd63fe0b2 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -13,6 +13,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTSECRETD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtsecretd ExecStart=3D@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf deleted file mode 100644 index 2247d05964..0000000000 --- a/src/secret/virtsecretd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtsecretd.service systemd unit - -VIRTSECRETD_ARGS=3D"--timeout 120" diff --git a/src/storage/meson.build b/src/storage/meson.build index d1aa66b147..c43707461d 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -125,11 +125,6 @@ if conf.has('WITH_STORAGE') 'name': 'virtstoraged', 'in_file': files('virtstoraged.init.in'), } - - sysconf_files +=3D { - 'name': 'virtstoraged', - 'file': files('virtstoraged.sysconf'), - } endif =20 if conf.has('WITH_STORAGE_DISK') diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in index fc3e9a1b69..f72f8426fd 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -15,6 +15,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTSTORAGED_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtstoraged ExecStart=3D@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sy= sconf deleted file mode 100644 index 122373eb7c..0000000000 --- a/src/storage/virtstoraged.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtstoraged.service systemd unit - -VIRTSTORAGED_ARGS=3D"--timeout 120" diff --git a/src/vbox/meson.build b/src/vbox/meson.build index df0cfb40e8..240f2389a9 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -68,9 +68,4 @@ if conf.has('WITH_VBOX') 'name': 'virtvboxd', 'in_file': files('virtvboxd.init.in'), } - - sysconf_files +=3D { - 'name': 'virtvboxd', - 'file': files('virtvboxd.sysconf'), - } endif diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index ebb31dde07..cfdafc39d2 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -14,6 +14,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTVBOXD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvboxd ExecStart=3D@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf deleted file mode 100644 index 37ad353d54..0000000000 --- a/src/vbox/virtvboxd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtvboxd.service systemd unit - -VIRTVBOXD_ARGS=3D"--timeout 120" diff --git a/src/vz/meson.build b/src/vz/meson.build index 14f7280f66..d102696943 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -58,9 +58,4 @@ if conf.has('WITH_VZ') 'name': 'virtvzd', 'in_file': files('virtvzd.init.in'), } - - sysconf_files +=3D { - 'name': 'virtvzd', - 'file': files('virtvzd.sysconf'), - } endif diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index f551cb8fbf..7636bf2b9e 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -14,6 +14,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify +Environment=3DVIRTVZD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvzd ExecStart=3D@sbindir@/virtvzd $VIRTVZD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf deleted file mode 100644 index a86b9dfb6c..0000000000 --- a/src/vz/virtvzd.sysconf +++ /dev/null @@ -1,3 +0,0 @@ -# Customizations for the virtvzd.service systemd unit - -VIRTVZD_ARGS=3D"--timeout 120" diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf deleted file mode 100644 index 4f83edab90..0000000000 --- a/tools/libvirt-guests.sysconf +++ /dev/null @@ -1,50 +0,0 @@ -# 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 - -# action taken on host boot -# - start all guests which were running on shutdown are started on boot -# regardless on their autostart settings -# - ignore libvirt-guests init script won't start any guest on boot, howe= ver, -# guests marked as autostart will still be automatically started= by -# libvirtd -#ON_BOOT=3Dstart - -# Number of seconds to wait between each guest start. Set to 0 to allow -# parallel startup. -#START_DELAY=3D0 - -# action taken on host shutdown -# - suspend all running guests are suspended using virsh managedsave -# - shutdown all running guests are asked to shutdown. Please be careful = with -# this settings since there is no way to distinguish between a -# guest which is stuck or ignores shutdown requests and a guest -# which just needs a long time to shutdown. When setting -# ON_SHUTDOWN=3Dshutdown, you must also set SHUTDOWN_TIMEOUT t= o a -# value suitable for your guests. -#ON_SHUTDOWN=3Dsuspend - -# Number of guests will be shutdown concurrently, taking effect when -# "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown= one -# after another. Number of guests on shutdown at any time will not exceed = number -# set in this variable. -#PARALLEL_SHUTDOWN=3D0 - -# Number of seconds we're willing to wait for a guest to shut down. If par= allel -# shutdown is enabled, this timeout applies as a timeout for shutting down= all -# guests on a single URI defined in the variable URIS. If this is 0, then = there -# is no time out (use with caution, as guests might not respond to a shutd= own -# request). The default value is 300 seconds (5 minutes). -#SHUTDOWN_TIMEOUT=3D300 - -# If non-zero, try to bypass the file system cache when saving and -# restoring guests, even though this may give slower operation for -# some file systems. -#BYPASS_CACHE=3D0 - -# If non-zero, try to sync guest time on domain resume. Be aware, that -# this requires guest agent with support for time synchronization -# running in the guest. By default, this functionality is turned off. -#SYNC_TIME=3D1 diff --git a/tools/meson.build b/tools/meson.build index 22fa3604ba..0b1d82b059 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -307,12 +307,6 @@ configure_file( ) =20 if init_script =3D=3D 'systemd' - install_data( - 'libvirt-guests.sysconf', - install_dir: sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) - configure_file( input: 'libvirt-guests.service.in', output: '@BASENAME@', From nobody Thu Apr 25 01:46:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1641984332218813.4586370984316; Wed, 12 Jan 2022 02:45:32 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-UNBjYsYIMuu1CgFU6tCGpQ-1; Wed, 12 Jan 2022 05:45:27 -0500 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 C1A9E1006AA4; Wed, 12 Jan 2022 10:45:22 +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 E9B86753C9; Wed, 12 Jan 2022 10:45: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 0F9501809C87; Wed, 12 Jan 2022 10:45:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20CAjGCo025145 for ; Wed, 12 Jan 2022 05:45:16 -0500 Received: by smtp.corp.redhat.com (Postfix) id 69BA3C0809E; Wed, 12 Jan 2022 10:45:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6571AC08088 for ; Wed, 12 Jan 2022 10:45:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BD1C185A7B2 for ; Wed, 12 Jan 2022 10:45:16 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.219]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-661-LTEF0sjrNR2YnGyBXzZA5w-1; Wed, 12 Jan 2022 05:45:14 -0500 Received: from sender by smtp.strato.de (RZmta 47.37.6 AUTH) with ESMTPSA id k3f463y0CAjCPEi (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 12 Jan 2022 11:45:12 +0100 (CET) X-MC-Unique: UNBjYsYIMuu1CgFU6tCGpQ-1 X-MC-Unique: LTEF0sjrNR2YnGyBXzZA5w-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAgs09Vb1Rctxqmb8LO1WiVVKPbQ0XYaidf48W08=" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v8 2/2] NEWS: mention removal of sysconfig Date: Wed, 12 Jan 2022 11:45:09 +0100 Message-Id: <20220112104509.32689-3-olaf@aepfle.de> In-Reply-To: <20220112104509.32689-1-olaf@aepfle.de> References: <20220112104509.32689-1-olaf@aepfle.de> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-loop: libvir-list@redhat.com Cc: Olaf Hering 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1641984333162100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Olaf Hering Reviewed-by: Andrea Bolognani --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index b5893627e3..cfa1b379f6 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -57,6 +57,16 @@ v8.0.0 (unreleased) =20 * libxl: Implement the virDomainGetMessages API =20 + * packaging: sysconfig files no longer installed + + libvirt used to provide defaults in various /etc/sysconfig/ files, such + as /etc/sysconfig/libvirtd. Since these files are owned by the admin, = this + made it difficult to change built-in defaults in case such file was + modified by the admin. The built-in defaults are now part of the provi= ded + systemd unit files, such as libvirtd.service. These unit files continue + to parse sysconfig files, in case they are created by the admin and fi= lled + with the desired key=3Dvalue pairs. + * **Bug fixes** =20 * qemu: Fix device hot-unplug with ``libvirt-7.9`` or ``libvirt-7.10`` u= sed with ``qemu-6.2``