projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fba060a
)
watchdog: pass right error code to log function so that %m works
author
Lennart Poettering
<lennart@poettering.net>
Wed, 15 Sep 2021 13:43:42 +0000
(15:43 +0200)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 12 Oct 2021 15:59:26 +0000
(17:59 +0200)
(cherry picked from commit
a4588af942af976c55f72869340c24d5017db278
)
(cherry picked from commit
11d5f109b04cd61c8bf437065b5e178c485a49b4
)
src/shared/watchdog.c
patch
|
blob
|
history
diff --git
a/src/shared/watchdog.c
b/src/shared/watchdog.c
index d33acafe64d869b91aee402e0307ac7462e8f067..8586a88e542629d1136d5b948fdc08950373d352 100644
(file)
--- a/
src/shared/watchdog.c
+++ b/
src/shared/watchdog.c
@@
-47,8
+47,8
@@
static int update_timeout(void) {
flags = WDIOS_ENABLECARD;
if (ioctl(watchdog_fd, WDIOC_SETOPTIONS, &flags) < 0) {
/* ENOTTY means the watchdog is always enabled so we're fine */
- log_full
(ERRNO_IS_NOT_SUPPORTED(errno) ? LOG_DEBUG : LOG_WARNING
,
-
"Failed to enable hardware watchdo
g: %m");
+ log_full
_errno(ERRNO_IS_NOT_SUPPORTED(errno) ? LOG_DEBUG : LOG_WARNING, errno
,
+
"Failed to enable hardware watchdog, ignorin
g: %m");
if (!ERRNO_IS_NOT_SUPPORTED(errno))
return -errno;
}