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@xxxxxxxxxx> --- src/interface/virtinterfaced.service.in | 2 +- src/interface/virtinterfaced.sysconf | 2 +- src/libxl/virtxend.service.in | 2 +- src/libxl/virtxend.sysconf | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/lxc/virtlxcd.sysconf | 2 +- src/network/virtnetworkd.service.in | 2 +- src/network/virtnetworkd.sysconf | 2 +- src/node_device/virtnodedevd.service.in | 2 +- src/node_device/virtnodedevd.sysconf | 2 +- src/nwfilter/virtnwfilterd.service.in | 2 +- src/nwfilter/virtnwfilterd.sysconf | 2 +- src/qemu/virtqemud.service.in | 2 +- src/qemu/virtqemud.sysconf | 2 +- src/remote/virtproxyd.service.in | 2 +- src/remote/virtproxyd.sysconf | 2 +- src/secret/virtsecretd.service.in | 2 +- src/secret/virtsecretd.sysconf | 2 +- src/storage/virtstoraged.service.in | 2 +- src/storage/virtstoraged.sysconf | 2 +- src/vbox/virtvboxd.service.in | 2 +- src/vbox/virtvboxd.sysconf | 2 +- src/vz/virtvzd.service.in | 2 +- src/vz/virtvzd.sysconf | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in index 4dbd7a627b..73d409b81b 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -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 diff --git a/src/interface/virtinterfaced.sysconf b/src/interface/virtinterfaced.sysconf index c131f559d2..0685da31b8 100644 --- a/src/interface/virtinterfaced.sysconf +++ b/src/interface/virtinterfaced.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtinterfaced.service systemd unit -VIRTINTERFACED_ARGS="" +VIRTINTERFACED_ARGS="--timeout 120" diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 8a794647ac..a863917467 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -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 diff --git a/src/libxl/virtxend.sysconf b/src/libxl/virtxend.sysconf index 7fa4b7b464..301da47e8d 100644 --- a/src/libxl/virtxend.sysconf +++ b/src/libxl/virtxend.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtxend.service systemd unit -VIRTXEND_ARGS="" +VIRTXEND_ARGS="--timeout 120" diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 0665f21ee0..3af7c1a52d 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -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 diff --git a/src/lxc/virtlxcd.sysconf b/src/lxc/virtlxcd.sysconf index d342aec88b..119a4a23f3 100644 --- a/src/lxc/virtlxcd.sysconf +++ b/src/lxc/virtlxcd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtlxcd.service systemd unit -VIRTLXCD_ARGS="" +VIRTLXCD_ARGS="--timeout 120" diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in index beef277a34..e7f1326945 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -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 diff --git a/src/network/virtnetworkd.sysconf b/src/network/virtnetworkd.sysconf index fda82c1a76..93f3a7a327 100644 --- a/src/network/virtnetworkd.sysconf +++ b/src/network/virtnetworkd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnetworkd.service systemd unit -VIRTNETWORKD_ARGS="" +VIRTNETWORKD_ARGS="--timeout 120" diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in index 4795fc9167..d2453dd620 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -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 diff --git a/src/node_device/virtnodedevd.sysconf b/src/node_device/virtnodedevd.sysconf index 9ffea04634..fa7faa3a79 100644 --- a/src/node_device/virtnodedevd.sysconf +++ b/src/node_device/virtnodedevd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnodedevd.service systemd unit -VIRTNODEDEVD_ARGS="" +VIRTNODEDEVD_ARGS="--timeout 120" diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in index 3517232edc..dda7c01a3d 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -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 diff --git a/src/nwfilter/virtnwfilterd.sysconf b/src/nwfilter/virtnwfilterd.sysconf index 4d46b6581a..80cc645ba5 100644 --- a/src/nwfilter/virtnwfilterd.sysconf +++ b/src/nwfilter/virtnwfilterd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtnwfilterd.service systemd unit -VIRTNWFILTERD_ARGS="" +VIRTNWFILTERD_ARGS="--timeout 120" diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 55a95640b1..8abc9d3a7f 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -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 diff --git a/src/qemu/virtqemud.sysconf b/src/qemu/virtqemud.sysconf index 1bab275240..70f76c7c47 100644 --- a/src/qemu/virtqemud.sysconf +++ b/src/qemu/virtqemud.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtqemud.service systemd unit -VIRTQEMUD_ARGS="" +VIRTQEMUD_ARGS="--timeout 120" diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in index 39d82bb53d..f43ce9ee6e 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -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 diff --git a/src/remote/virtproxyd.sysconf b/src/remote/virtproxyd.sysconf index 805b6185b5..0fc5c61096 100644 --- a/src/remote/virtproxyd.sysconf +++ b/src/remote/virtproxyd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtproxyd.service systemd unit -VIRTPROXYD_ARGS="" +VIRTPROXYD_ARGS="--timeout 120" diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in index 84f2001028..8444142a3a 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -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 diff --git a/src/secret/virtsecretd.sysconf b/src/secret/virtsecretd.sysconf index 9303dd7bcc..2247d05964 100644 --- a/src/secret/virtsecretd.sysconf +++ b/src/secret/virtsecretd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtsecretd.service systemd unit -VIRTSECRETD_ARGS="" +VIRTSECRETD_ARGS="--timeout 120" diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in index a33fb289d5..fc3e9a1b69 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -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 diff --git a/src/storage/virtstoraged.sysconf b/src/storage/virtstoraged.sysconf index 268d80b902..122373eb7c 100644 --- a/src/storage/virtstoraged.sysconf +++ b/src/storage/virtstoraged.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtstoraged.service systemd unit -VIRTSTORAGED_ARGS="" +VIRTSTORAGED_ARGS="--timeout 120" diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index 8240c45646..ebb31dde07 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -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 diff --git a/src/vbox/virtvboxd.sysconf b/src/vbox/virtvboxd.sysconf index a94c8ae23c..37ad353d54 100644 --- a/src/vbox/virtvboxd.sysconf +++ b/src/vbox/virtvboxd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtvboxd.service systemd unit -VIRTVBOXD_ARGS="" +VIRTVBOXD_ARGS="--timeout 120" diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index 15ccfeb172..f551cb8fbf 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -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 diff --git a/src/vz/virtvzd.sysconf b/src/vz/virtvzd.sysconf index 7db30df94b..a86b9dfb6c 100644 --- a/src/vz/virtvzd.sysconf +++ b/src/vz/virtvzd.sysconf @@ -1,3 +1,3 @@ # Customizations for the virtvzd.service systemd unit -VIRTVZD_ARGS="" +VIRTVZD_ARGS="--timeout 120" -- 2.25.1
