From: Trevor Gamblin Date: Mon, 7 Oct 2019 17:56:20 +0000 (-0400) Subject: watchdog: fix PIDFile path in existing patch X-Git-Tag: 2019-10~21 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c279c9d7f0c948856052015cad59310a55274b92;p=openembedded-core.git watchdog: fix PIDFile path in existing patch systemd throws a warning about the value of PIDFile: systemd[1]: /usr/lib/systemd/system/watchdog.service:11: PIDFile= references a path below legacy directory /var/run/, updating /var/run/watchdog.pid → /run/watchdog.pid; please update the unit file accordingly. This is actually due to patch file 0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch setting PIDFile=/var/run/watchdog.pid. Modify PIDFile in the patch to be correctly set to /run/watchdog.pid. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch b/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch index 338e0cd14f..075a98e5e5 100644 --- a/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch +++ b/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch @@ -34,7 +34,7 @@ index 7a2fc36..f31d1fe 100644 -ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' -ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' +ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' -+PIDFile=/var/run/watchdog.pid ++PIDFile=/run/watchdog.pid [Install] -WantedBy=default.target