On Wed, Dec 2, 2020 at 11:47 AM Olaf Hering <o...@aepfle.de> wrote: > > Currently the arguments for xenwatchdogd are hardcoded with 15s > keep-alive interval and 30s timeout. > > It is not possible to tweak these values via > /etc/systemd/system/xen-watchdog.service.d/*.conf because ExecStart > can not be replaced. The only option would be a private copy > /etc/systemd/system/xen-watchdog.service, which may get out of sync > with the Xen provided xen-watchdog.service. > > Adjust the service file to recognize XENWATCHDOGD_ARGS= in a > private unit configuration file. > > Signed-off-by: Olaf Hering <o...@aepfle.de> > --- > tools/hotplug/Linux/init.d/xen-watchdog.in | 7 ++++++- > tools/hotplug/Linux/systemd/xen-watchdog.service.in | 4 +++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/tools/hotplug/Linux/init.d/xen-watchdog.in > b/tools/hotplug/Linux/init.d/xen-watchdog.in > index c05f1f6b6a..87e2353b49 100644 > --- a/tools/hotplug/Linux/init.d/xen-watchdog.in > +++ b/tools/hotplug/Linux/init.d/xen-watchdog.in > @@ -19,6 +19,11 @@ > > . @XEN_SCRIPT_DIR@/hotplugpath.sh > > +xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ > + > +test -f $xencommons_config/xencommons && . $xencommons_config/xencommons > + > +test -z "$XENWATCHDOGD_ARGS" || XENWATCHDOGD_ARGS='15 30'
This should be `test -z ... && ` or `test -n ... || ` to set the default values properly. Regards, Jason
