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: NAndrea Bolognani <abologna@redhat.com>
Reviewed-by: NDaniel P. Berrangé <berrange@redhat.com>

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
 

src/interface/virtinterfaced.sysconf

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

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

src/libxl/virtxend.sysconf

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

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

src/lxc/virtlxcd.sysconf

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

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

src/network/virtnetworkd.sysconf

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

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
 

src/node_device/virtnodedevd.sysconf

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

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
 

src/nwfilter/virtnwfilterd.sysconf

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

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

src/qemu/virtqemud.sysconf

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

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
 

src/remote/virtproxyd.sysconf

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

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
 

src/secret/virtsecretd.sysconf

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

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
 

src/storage/virtstoraged.sysconf

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

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
 

src/vbox/virtvboxd.sysconf

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

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
 

src/vz/virtvzd.sysconf

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