[oe-commits] [openembedded-core] 06/08: watchdog: fix PIDFile path in existing patch

git at git.openembedded.org git at git.openembedded.org
Tue Oct 8 10:22:52 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit c279c9d7f0c948856052015cad59310a55274b92
Author: Trevor Gamblin <trevor.gamblin at windriver.com>
AuthorDate: Mon Oct 7 13:56:20 2019 -0400

    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 <trevor.gamblin at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 338e0cd..075a98e 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list