External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: Add sysconf files for all daemons

Browse Source 
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>
This commit is contained in:
Andrea Bolognani 2020-04-01 19:59:14 +02:00
parent 9884ae3479
commit 93c13f0d93
37 changed files with 97 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvirt.spec.in
View File

@ -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

2
src/interface/Makefile.inc.am
View File

@ -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 \

3
src/interface/virtinterfaced.service.in
View File

@ -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

3
src/interface/virtinterfaced.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtinterfaced.service systemd unit
VIRTINTERFACED_ARGS=""

2
src/libxl/Makefile.inc.am
View File

@ -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 \

3
src/libxl/virtxend.service.in
View File

@ -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

3
src/libxl/virtxend.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtxend.service systemd unit
VIRTXEND_ARGS=""

2
src/lxc/Makefile.inc.am
View File

@ -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 \

3
src/lxc/virtlxcd.service.in
View File

@ -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

3
src/lxc/virtlxcd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtlxcd.service systemd unit
VIRTLXCD_ARGS=""

2
src/network/Makefile.inc.am
View File

@ -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 \

3
src/network/virtnetworkd.service.in
View File

@ -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

3
src/network/virtnetworkd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtnetworkd.service systemd unit
VIRTNETWORKD_ARGS=""

2
src/node_device/Makefile.inc.am
View File

@ -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 \

3
src/node_device/virtnodedevd.service.in
View File

@ -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

3
src/node_device/virtnodedevd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtnodedevd.service systemd unit
VIRTNODEDEVD_ARGS=""

2
src/nwfilter/Makefile.inc.am
View File

@ -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 \

3
src/nwfilter/virtnwfilterd.service.in
View File

@ -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

3
src/nwfilter/virtnwfilterd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtnwfilterd.service systemd unit
VIRTNWFILTERD_ARGS=""

2
src/qemu/Makefile.inc.am
View File

@ -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 \

3
src/qemu/virtqemud.service.in
View File

@ -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

3
src/qemu/virtqemud.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtqemud.service systemd unit
VIRTQEMUD_ARGS=""

5
src/remote/Makefile.inc.am
View File

@ -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 \

3
src/remote/virtproxyd.service.in
View File

@ -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

3
src/remote/virtproxyd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtproxyd.service systemd unit
VIRTPROXYD_ARGS=""

2
src/secret/Makefile.inc.am
View File

@ -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 \

3
src/secret/virtsecretd.service.in
View File

@ -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

3
src/secret/virtsecretd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtsecretd.service systemd unit
VIRTSECRETD_ARGS=""

2
src/storage/Makefile.inc.am
View File

@ -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 \

3
src/storage/virtstoraged.service.in
View File

@ -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

3
src/storage/virtstoraged.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtstoraged.service systemd unit
VIRTSTORAGED_ARGS=""

2
src/vbox/Makefile.inc.am
View File

@ -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 \

3
src/vbox/virtvboxd.service.in
View File

@ -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

3
src/vbox/virtvboxd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtvboxd.service systemd unit
VIRTVBOXD_ARGS=""

2
src/vz/Makefile.inc.am
View File

@ -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 \

3
src/vz/virtvzd.service.in
View File

@ -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

3
src/vz/virtvzd.sysconf Normal file
View File

@ -0,0 +1,3 @@
# Customizations for the virtvzd.service systemd unit
VIRTVZD_ARGS=""