systemd: Add sysconf files for all daemons

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/libvirt.spec.in b/libvirt.spec.in
index efeeac31b9553e5b0fc47ea8a9fb8e5172918636..6061a2649715b589df839814d0040c7e7ae2313a 100644 (file)
--- 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 39157c077034e0773879ad105d8ed2fe292c9b18..46a43e61db1ba307fb07725281bc753d2db6c563 100644 (file)
--- 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 ff3a611d16f41db27dc1483e6a06143210524e1c..4dbd7a627b5001be8ed8117a934528bed169d402 100644 (file)
--- 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=-@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 (file)
index 0000000..c131f55
--- /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 ff6a2b0f69ac719db021b169c61bfbd04d4ed519..619835a46b6bc5d638812dcdf6465f52337fa88b 100644 (file)
--- 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 b4b6ce6d8c122fbe609f6a4fc0e87c651a684e28..8a794647ac0fbeedc869ea57e7f5f874e60840bc 100644 (file)
--- 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=-@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 (file)
index 0000000..7fa4b7b
--- /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 2fee607d3dfa21152238483eba4371317aa45858..b8c2e1eb3db29b750a67c6be8f7f2c75dc7c3288 100644 (file)
--- 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 33f8ca2d4d3f4b7390b153b93dddc3b8a7a591d4..0665f21ee06561b2955c09215861e65100ce71b1 100644 (file)
--- 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=-@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 (file)
index 0000000..d342aec
--- /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 bc05b01987bdd5bdd01d8162406ee6257c0e2f62..196a30e16cdd8f28fdd759f979b7c34b1ccf1c17 100644 (file)
--- 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 656e8b4f845b8a1e8598f2eca21b28d12704f703..beef277a3400886fc56d807f6ab5a30060617942 100644 (file)
--- 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=-@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 (file)
index 0000000..fda82c1
--- /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 0b287189bce7e6482198061069ade9ddf8d46832..788563665f5295ca7a74c89750dc5889d0d365c9 100644 (file)
--- 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 132ee05a7f911decd62da238299bcef0a1452107..4795fc91673fdd42acc6eed236048062e3e35d06 100644 (file)
--- 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=-@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 (file)
index 0000000..9ffea04
--- /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 9a68fd80b69d9c695fe4391552c76b421a7dadd3..20db8090e066ee59707f8a7255a15910815bd74f 100644 (file)
--- 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 57c2fafe43142e4e0aaa6b6b9aef8ad2c3872951..3517232edc30fe9649ea7ae5c1a807c6f6ddaca2 100644 (file)
--- 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=-@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 (file)
index 0000000..4d46b65
--- /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 51cd79879d7edd6652e3527947ce9876a7783740..c42c470a4ccb8a508856ff209dfbcc5dfbf4338d 100644 (file)
--- 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 aa24bdaab73f5a574cab05c1d9aa86bf3ab9600d..55a95640b1b9f6c1f902dea27b612b459913c66a 100644 (file)
--- 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=-@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 (file)
index 0000000..1bab275
--- /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 958bd18f86636fcf9d943670352c0e6d56f827e6..1b1be8340df8e4465c9f89e4c466ec95a1039290 100644 (file)
--- 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 e99e2af19c47125b4174c37c0c26e2a097babd17..39d82bb53d8537e395a23238063d115426587f2a 100644 (file)
--- 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=-@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 (file)
index 0000000..805b618
--- /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 63c8bc6dba04ad90c263ec956d39c3568c023ba5..a8390f826522b0e3aa4a8b1c924432a8d624db14 100644 (file)
--- 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 00cdc26b9787c3adfcf14762dd31a3806a7cef8a..84f2001028f9ccb53872a910270dec0fd28db3eb 100644 (file)
--- 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=-@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 (file)
index 0000000..9303dd7
--- /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 3655b8a53ca45dd5ce6bb3eb53fa9965115e5f0e..2f46d244f3ac3690b848b58b45ab508799848a33 100644 (file)
--- 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 9aa26764a9abebbadd886d962b45a91c6b0f0d17..a33fb289d52758d0d67bab577ad3b22d3488383e 100644 (file)
--- 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=-@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 (file)
index 0000000..268d80b
--- /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 72a15c6468d7be1ebf4df07bd94612d45fe1c36e..8d2467f39e0effd3d6eafcf433bc79c0ee39d21d 100644 (file)
--- 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 7e0f7518d6c35d32c7893ed2b7f0b297a614a7f6..8240c456466af16d5e9f110dde9f2ec41abdf39d 100644 (file)
--- 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=-@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 (file)
index 0000000..a94c8ae
--- /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 cabe18a9a1637dbda39d28d2f4995032e150371e..f60f73bf06f6eb89dae43d7637d5d6831dad688a 100644 (file)
--- 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 cd0f55876820c35fc55e9ee7e071fe77bed51fa0..15ccfeb1722753f605afa18883ce69b14224ea02 100644 (file)
--- 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=-@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 (file)
index 0000000..7db30df
--- /dev/null
+++ b/src/vz/virtvzd.sysconf
@@ -0,0 +1,3 @@
+# Customizations for the virtvzd.service systemd unit
+
+VIRTVZD_ARGS=""