From: Dave Reisner <dreisner@archlinux.org>
Date: Fri, 21 Feb 2014 15:31:26 +0000 (-0500)
Subject: journald: ignore failure to watch hostname_fd on older kernels
X-Git-Tag: v210~74
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=28def94cc8fd4394b20e2155d7130166662343c4

journald: ignore failure to watch hostname_fd on older kernels

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.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 5872e91fb..96ef66db5 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -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;
         }