shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

journald: ignore failure to watch hostname_fd on older kernels

Browse Source 
Prior to 3.2, /proc/sys/kernel/hostname isn't a pollable file and
sd_event_add_io will return EPERM. Ignore this failure, since it isn't
critical to journald operation.

Reported and tested by user sraue on IRC.
This commit is contained in:
Dave Reisner 2014-02-21 10:31:26 -05:00
parent d60473c7ba
commit 28def94cc8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/journal/journald-server.c
View File

@ -1430,6 +1430,16 @@ static int server_open_hostname(Server *s) {
r = sd_event_add_io(s->event, &s->hostname_event_source, s->hostname_fd, 0, dispatch_hostname_change, s);
if (r < 0) {
/* kernels prior to 3.2 don't support polling this file. Ignore
* the failure. */
if (r == -EPERM) {
log_warning("Failed to register hostname fd in event loop: %s. Ignoring.",
strerror(-r));
close_nointr_nofail(s->hostname_fd);
s->hostname_fd = -1;
return 0;
}
log_error("Failed to register hostname fd in event loop: %s", strerror(-r));
return r;
}