systemd: Move timeout from service files to sysconf files

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>

diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
index 4dbd7a627b5001be8ed8117a934528bed169d402..73d409b81bd90b620a27b62e07b31f66b6490219 100644 (file)
--- 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 c131f559d2c2b74c4cf30163f051b9ea94bd7baf..0685da31b834242e42b57a4a0a9f60eadc0a0705 100644 (file)
--- 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 8a794647ac0fbeedc869ea57e7f5f874e60840bc..a863917467293d123ad4e8008517014aebaed898 100644 (file)
--- 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 7fa4b7b46464b31f9f78b9d8f098cdb0883c774f..301da47e8dcd725ec75ac1ed0d671c5fae6393c4 100644 (file)
--- 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 0665f21ee06561b2955c09215861e65100ce71b1..3af7c1a52d81bd418fd9aa04a68eee73c83f5718 100644 (file)
--- 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 d342aec88ba941b373b63c3fe5682bd74876a131..119a4a23f38a246541c477ed92aee7f2dc68eb6c 100644 (file)
--- 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 beef277a3400886fc56d807f6ab5a30060617942..e7f13269459fea3185a633beb384560a9393ec9c 100644 (file)
--- 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 fda82c1a761c368275a29c2de80fe84045bcd844..93f3a7a327f3e627d5a4c7becdfc987c9c702c03 100644 (file)
--- 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 4795fc91673fdd42acc6eed236048062e3e35d06..d2453dd620e3cecc5989fa17a89f9f7b82f514c1 100644 (file)
--- 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 9ffea04634cbaf72497ff275ba8b57b5552444ce..fa7faa3a79ddd92230040c1ba71b361ebfa6e83d 100644 (file)
--- 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 3517232edc30fe9649ea7ae5c1a807c6f6ddaca2..dda7c01a3db50a70c9cd86c8177c50053895418e 100644 (file)
--- 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 4d46b6581a14b51d0b28eb65e11bcfa7fab52403..80cc645ba5b4642ed5880f49ed0a1910acc0fcd2 100644 (file)
--- 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 55a95640b1b9f6c1f902dea27b612b459913c66a..8abc9d3a7fd02e12d9d5f6de7bffd991b24611f3 100644 (file)
--- 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 1bab275240be83b110e7cf99dd41f891174756cb..70f76c7c4748ce6b7036667de87ce613ca72653d 100644 (file)
--- 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 39d82bb53d8537e395a23238063d115426587f2a..f43ce9ee6e41e37ef6c2fc2ac3503dcfdcbe1f51 100644 (file)
--- 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 805b6185b5a806655992081d7d3ef580c78eeb5a..0fc5c61096a4498079da44b982556dea8bdb0291 100644 (file)
--- 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 84f2001028f9ccb53872a910270dec0fd28db3eb..8444142a3a9f8410a57ea2fa54d1838b8d5d4780 100644 (file)
--- 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 9303dd7bcc856c178fea45cba129780853a8e615..2247d0596427409f25fc6231b85a81871a2f2dd4 100644 (file)
--- 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 a33fb289d52758d0d67bab577ad3b22d3488383e..fc3e9a1b69ad3419ba34444d6bb2119503640279 100644 (file)
--- 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 268d80b902c82aa3319684128ab018330531f61d..122373eb7c2ebec621cfe168ebcae7df0029dc3c 100644 (file)
--- 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 8240c456466af16d5e9f110dde9f2ec41abdf39d..ebb31dde07351f74b6a928276ad23d878edb4f0a 100644 (file)
--- 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 a94c8ae23c638d69367c33d0b905fabc0ad3c80b..37ad353d544190819e103e6bb5a9d2d4142f3370 100644 (file)
--- 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 15ccfeb1722753f605afa18883ce69b14224ea02..f551cb8fbf03441deb6c2444156bb55711911f75 100644 (file)
--- 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 7db30df94b502b03971d1b65b287a73d10940825..a86b9dfb6ce96df2135c0f9ce4a4d9632c9105a3 100644 (file)
--- 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"