[libvirt PATCH v2 3/6] systemd: Add sysconf files for all daemons

Andrea Bolognani abologna at redhat.com
Thu Apr 2 17:14:28 UTC 2020 

While not terribly useful in general, tweaking each daemon's
timeout (or disabling it off altogether) is a valid use case which
we can very easily support while being consistent with what already
happens for libvirtd. This is a first step in that direction.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
Reviewed-by: Ján Tomko <jtomko at redhat.com>
---
 libvirt.spec.in                         | 11 +++++++++++
 src/interface/Makefile.inc.am           |  2 ++
 src/interface/virtinterfaced.service.in |  3 ++-
 src/interface/virtinterfaced.sysconf    |  3 +++
 src/libxl/Makefile.inc.am               |  2 ++
 src/libxl/virtxend.service.in           |  3 ++-
 src/libxl/virtxend.sysconf              |  3 +++
 src/lxc/Makefile.inc.am                 |  2 ++
 src/lxc/virtlxcd.service.in             |  3 ++-
 src/lxc/virtlxcd.sysconf                |  3 +++
 src/network/Makefile.inc.am             |  2 ++
 src/network/virtnetworkd.service.in     |  3 ++-
 src/network/virtnetworkd.sysconf        |  3 +++
 src/node_device/Makefile.inc.am         |  2 ++
 src/node_device/virtnodedevd.service.in |  3 ++-
 src/node_device/virtnodedevd.sysconf    |  3 +++
 src/nwfilter/Makefile.inc.am            |  2 ++
 src/nwfilter/virtnwfilterd.service.in   |  3 ++-
 src/nwfilter/virtnwfilterd.sysconf      |  3 +++
 src/qemu/Makefile.inc.am                |  2 ++
 src/qemu/virtqemud.service.in           |  3 ++-
 src/qemu/virtqemud.sysconf              |  3 +++
 src/remote/Makefile.inc.am              |  5 ++++-
 src/remote/virtproxyd.service.in        |  3 ++-
 src/remote/virtproxyd.sysconf           |  3 +++
 src/secret/Makefile.inc.am              |  2 ++
 src/secret/virtsecretd.service.in       |  3 ++-
 src/secret/virtsecretd.sysconf          |  3 +++
 src/storage/Makefile.inc.am             |  2 ++
 src/storage/virtstoraged.service.in     |  3 ++-
 src/storage/virtstoraged.sysconf        |  3 +++
 src/vbox/Makefile.inc.am                |  2 ++
 src/vbox/virtvboxd.service.in           |  3 ++-
 src/vbox/virtvboxd.sysconf              |  3 +++
 src/vz/Makefile.inc.am                  |  2 ++
 src/vz/virtvzd.service.in               |  3 ++-
 src/vz/virtvzd.sysconf                  |  3 +++
 37 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 src/interface/virtinterfaced.sysconf
 create mode 100644 src/libxl/virtxend.sysconf
 create mode 100644 src/lxc/virtlxcd.sysconf
 create mode 100644 src/network/virtnetworkd.sysconf
 create mode 100644 src/node_device/virtnodedevd.sysconf
 create mode 100644 src/nwfilter/virtnwfilterd.sysconf
 create mode 100644 src/qemu/virtqemud.sysconf
 create mode 100644 src/remote/virtproxyd.sysconf
 create mode 100644 src/secret/virtsecretd.sysconf
 create mode 100644 src/storage/virtstoraged.sysconf
 create mode 100644 src/vbox/virtvboxd.sysconf
 create mode 100644 src/vz/virtvzd.sysconf

diff --git a/libvirt.spec.in b/libvirt.spec.in
index efeeac31b9..6061a26497 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1532,6 +1532,7 @@ exit 0
 %{_unitdir}/virtlockd.socket
 %{_unitdir}/virtlockd-admin.socket
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
+%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
@@ -1600,6 +1601,7 @@ exit 0
 %ghost %{_sysconfdir}/libvirt/nwfilter/*.xml
 
 %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
 
 %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
 
 %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
 
 %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
 
 %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
 
 %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
 
 %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
 
 %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
 
 %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
 
 %if %{with_vbox}
 %files daemon-driver-vbox
+%config(noreplace) %{_sysconfdir}/sysconfig/virtvboxd
 %config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
 %{_datadir}/augeas/lenses/virtvboxd.aug
 %{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 39157c0770..46a43e61db 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -61,6 +61,8 @@ virtinterfaced_CFLAGS = \
 virtinterfaced_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtinterfaced_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += interface/virtinterfaced.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	virtinterfaced.service \
 	virtinterfaced.socket \
diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
index ff3a611d16..4dbd7a627b 100644
--- a/src/interface/virtinterfaced.service.in
+++ b/src/interface/virtinterfaced.service.in
@@ -13,7 +13,8 @@ Documentation=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtinterfaced --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtinterfaced
+ExecStart=@sbindir@/virtinterfaced --timeout 120 $VIRTINTERFACED_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinterfaced.sysconf
new file mode 100644
index 0000000000..c131f559d2
--- /dev/null
+++ b/src/interface/virtinterfaced.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtinterfaced.service systemd unit
+
+VIRTINTERFACED_ARGS=""
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 = \
 virtxend_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtxend_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += libxl/virtxend.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=/proc/xen/capabilities
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtxend --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtxend
+ExecStart=@sbindir@/virtxend --timeout 120 $VIRTXEND_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 KillMode=process
diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf
new file mode 100644
index 0000000000..7fa4b7b464
--- /dev/null
+++ b/src/libxl/virtxend.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtxend.service systemd unit
+
+VIRTXEND_ARGS=""
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 = \
 virtlxcd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtlxcd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += lxc/virtlxcd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtlxcd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtlxcd
+ExecStart=@sbindir@/virtlxcd --timeout 120 $VIRTLXCD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure
diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf
new file mode 100644
index 0000000000..d342aec88b
--- /dev/null
+++ b/src/lxc/virtlxcd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtlxcd.service systemd unit
+
+VIRTLXCD_ARGS=""
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 = \
 virtnetworkd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtnetworkd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += network/virtnetworkd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtnetworkd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtnetworkd
+ExecStart=@sbindir@/virtnetworkd --timeout 120 $VIRTNETWORKD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 KillMode=process
diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sysconf
new file mode 100644
index 0000000000..fda82c1a76
--- /dev/null
+++ b/src/network/virtnetworkd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtnetworkd.service systemd unit
+
+VIRTNETWORKD_ARGS=""
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 = \
 virtnodedevd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtnodedevd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += node_device/virtnodedevd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	virtnodedevd.service \
 	virtnodedevd.socket \
diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtnodedevd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtnodedevd
+ExecStart=@sbindir@/virtnodedevd --timeout 120 $VIRTNODEDEVD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnodedevd.sysconf
new file mode 100644
index 0000000000..9ffea04634
--- /dev/null
+++ b/src/node_device/virtnodedevd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtnodedevd.service systemd unit
+
+VIRTNODEDEVD_ARGS=""
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 = \
 virtnwfilterd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtnwfilterd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	virtnwfilterd.service \
 	virtnwfilterd.socket \
diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in
index 57c2fafe43..3517232edc 100644
--- a/src/nwfilter/virtnwfilterd.service.in
+++ b/src/nwfilter/virtnwfilterd.service.in
@@ -13,7 +13,8 @@ Documentation=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtnwfilterd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtnwfilterd
+ExecStart=@sbindir@/virtnwfilterd --timeout 120 $VIRTNWFILTERD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilterd.sysconf
new file mode 100644
index 0000000000..4d46b6581a
--- /dev/null
+++ b/src/nwfilter/virtnwfilterd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtnwfilterd.service systemd unit
+
+VIRTNWFILTERD_ARGS=""
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 = \
 virtqemud_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtqemud_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += qemu/virtqemud.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtqemud --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtqemud
+ExecStart=@sbindir@/virtqemud --timeout 120 $VIRTQEMUD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure
diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf
new file mode 100644
index 0000000000..1bab275240
--- /dev/null
+++ b/src/qemu/virtqemud.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtqemud.service systemd unit
+
+VIRTQEMUD_ARGS=""
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 += \
 	remote/libvirtd.logrotate.in \
 	$(NULL)
 
-SYSCONF_FILES += remote/libvirtd.sysconf
+SYSCONF_FILES += \
+	remote/libvirtd.sysconf \
+	remote/virtproxyd.sysconf \
+	$(NULL)
 
 LIBVIRTD_SOCKET_UNIT_FILES_IN = \
 	remote/libvirtd.socket.in \
diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
index e99e2af19c..39d82bb53d 100644
--- a/src/remote/virtproxyd.service.in
+++ b/src/remote/virtproxyd.service.in
@@ -13,7 +13,8 @@ Documentation=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtproxyd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtproxyd
+ExecStart=@sbindir@/virtproxyd --timeout 120 $VIRTPROXYD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf
new file mode 100644
index 0000000000..805b6185b5
--- /dev/null
+++ b/src/remote/virtproxyd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtproxyd.service systemd unit
+
+VIRTPROXYD_ARGS=""
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 = \
 virtsecretd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtsecretd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += secret/virtsecretd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	virtsecretd.service \
 	virtsecretd.socket \
diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in
index 00cdc26b97..84f2001028 100644
--- a/src/secret/virtsecretd.service.in
+++ b/src/secret/virtsecretd.service.in
@@ -13,7 +13,8 @@ Documentation=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtsecretd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtsecretd
+ExecStart=@sbindir@/virtsecretd --timeout 120 $VIRTSECRETD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf
new file mode 100644
index 0000000000..9303dd7bcc
--- /dev/null
+++ b/src/secret/virtsecretd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtsecretd.service systemd unit
+
+VIRTSECRETD_ARGS=""
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 = \
 virtstoraged_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtstoraged_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += storage/virtstoraged.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtstoraged --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtstoraged
+ExecStart=@sbindir@/virtstoraged --timeout 120 $VIRTSTORAGED_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sysconf
new file mode 100644
index 0000000000..268d80b902
--- /dev/null
+++ b/src/storage/virtstoraged.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtstoraged.service systemd unit
+
+VIRTSTORAGED_ARGS=""
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 = \
 virtvboxd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtvboxd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += vbox/virtvboxd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtvboxd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtvboxd
+ExecStart=@sbindir@/virtvboxd --timeout 120 $VIRTVBOXD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf
new file mode 100644
index 0000000000..a94c8ae23c
--- /dev/null
+++ b/src/vbox/virtvboxd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtvboxd.service systemd unit
+
+VIRTVBOXD_ARGS=""
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 = \
 virtvzd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
 virtvzd_LDADD = $(REMOTE_DAEMON_LD_ADD)
 
+SYSCONF_FILES += vz/virtvzd.sysconf
+
 SYSTEMD_UNIT_FILES += \
 	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=https://libvirt.org
 
 [Service]
 Type=notify
-ExecStart=@sbindir@/virtvzd --timeout 120
+EnvironmentFile=- at sysconfdir@/sysconfig/virtvzd
+ExecStart=@sbindir@/virtvzd --timeout 120 $VIRTVZD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
 
diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf
new file mode 100644
index 0000000000..7db30df94b
--- /dev/null
+++ b/src/vz/virtvzd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtvzd.service systemd unit
+
+VIRTVZD_ARGS=""
-- 
2.25.1

More information about the libvir-list mailing list