]> code.ossystems Code Review - openembedded-core.git/commitdiff
watchdog: fix PIDFile path in existing patch
authorTrevor Gamblin <trevor.gamblin@windriver.com>
Mon, 7 Oct 2019 17:56:20 +0000 (13:56 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 8 Oct 2019 10:22:19 +0000 (11:22 +0100)
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 <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch

index 338e0cd14fbf74f51ee441697a7ee64cb9cd2849..075a98e5e5b111760470e7b203405f7505934f15 100644 (file)
@@ -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