External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: Move timeout from service files to sysconf files

Browse Source 
This follows the example set by libvirtd, and makes it easier for
the admin to tweak the timeout or disable it altogether.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Andrea Bolognani 2020-04-02 18:01:12 +02:00
parent 93c13f0d93
commit ef0fa8395f
24 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
ExecStart=@sbindir@/virtinterfaced --timeout 120 $VIRTINTERFACED_ARGS
ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/interface/virtinterfaced.sysconf
View File

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

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

@ -18,7 +18,7 @@ ConditionPathExists=/proc/xen/capabilities
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
ExecStart=@sbindir@/virtxend --timeout 120 $VIRTXEND_ARGS
ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
KillMode=process

2
src/libxl/virtxend.sysconf
View File

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

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

@ -19,7 +19,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
ExecStart=@sbindir@/virtlxcd --timeout 120 $VIRTLXCD_ARGS
ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure

2
src/lxc/virtlxcd.sysconf
View File

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

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

@ -14,7 +14,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
ExecStart=@sbindir@/virtnetworkd --timeout 120 $VIRTNETWORKD_ARGS
ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
KillMode=process

2
src/network/virtnetworkd.sysconf
View File

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

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

@ -14,7 +14,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
ExecStart=@sbindir@/virtnodedevd --timeout 120 $VIRTNODEDEVD_ARGS
ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/node_device/virtnodedevd.sysconf
View File

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

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

@ -14,7 +14,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
ExecStart=@sbindir@/virtnwfilterd --timeout 120 $VIRTNWFILTERD_ARGS
ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/nwfilter/virtnwfilterd.sysconf
View File

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

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

@ -19,7 +19,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
ExecStart=@sbindir@/virtqemud --timeout 120 $VIRTQEMUD_ARGS
ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure

2
src/qemu/virtqemud.sysconf
View File

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

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

@ -14,7 +14,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
ExecStart=@sbindir@/virtproxyd --timeout 120 $VIRTPROXYD_ARGS
ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/remote/virtproxyd.sysconf
View File

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

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

@ -14,7 +14,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
ExecStart=@sbindir@/virtsecretd --timeout 120 $VIRTSECRETD_ARGS
ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/secret/virtsecretd.sysconf
View File

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

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

@ -16,7 +16,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
ExecStart=@sbindir@/virtstoraged --timeout 120 $VIRTSTORAGED_ARGS
ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/storage/virtstoraged.sysconf
View File

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

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

@ -15,7 +15,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
ExecStart=@sbindir@/virtvboxd --timeout 120 $VIRTVBOXD_ARGS
ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/vbox/virtvboxd.sysconf
View File

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

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

@ -15,7 +15,7 @@ Documentation=https://libvirt.org
[Service]
Type=notify
EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd
ExecStart=@sbindir@/virtvzd --timeout 120 $VIRTVZD_ARGS
ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure

2
src/vz/virtvzd.sysconf
View File

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