shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-28 21:47:38 +03:00
Code

journald: close /dev/kmsg again if we cannot make use of it

Browse Source
This commit is contained in:
Lennart Poettering 2013-12-17 19:57:13 +01:00
parent 445ea9be52
commit c0f71f469f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/journal/journald-kmsg.c
View File

@ -408,22 +408,30 @@ int server_open_dev_kmsg(Server *s) {
/* This will fail with EPERM on older kernels where
* /dev/kmsg is not readable. */
if (r == -EPERM)
return 0;
if (r == -EPERM) {
r = 0;
goto fail;
}
log_error("Failed to add /dev/kmsg fd to event loop: %s", strerror(-r));
return -errno;
goto fail;
}
r = sd_event_source_set_priority(s->dev_kmsg_event_source, SD_EVENT_PRIORITY_IMPORTANT+10);
if (r < 0) {
log_error("Failed to adjust priority of kmsg event source: %s", strerror(-r));
return -errno;
goto fail;
}
s->dev_kmsg_readable = true;
return 0;
fail:
close_nointr_nofail(s->dev_kmsg_fd);
s->dev_kmsg_fd = -1;
return r;
}
int server_open_kernel_seqnum(Server *s) {