diff options
| author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2019-10-07 13:56:20 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-08 11:22:24 +0100 |
| commit | bf4a21e4644354fbed2e74e685e8a66e1cc0718d (patch) | |
| tree | 341287567e984ce14e604a38bbbfd95fad45746a /meta/recipes-extended | |
| parent | a5a5708dbbb534f6624fafe9e78f96de25c10dea (diff) | |
| download | poky-bf4a21e4644354fbed2e74e685e8a66e1cc0718d.tar.gz | |
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.
(From OE-Core rev: c279c9d7f0c948856052015cad59310a55274b92)
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 34 | -ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' | 34 | -ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options' |
| 35 | -ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' | 35 | -ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false' |
| 36 | +ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' | 36 | +ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options' |
| 37 | +PIDFile=/var/run/watchdog.pid | 37 | +PIDFile=/run/watchdog.pid |
| 38 | 38 | ||
| 39 | [Install] | 39 | [Install] |
| 40 | -WantedBy=default.target | 40 | -WantedBy=default.target |