From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 14 Apr 2025 19:23:57 +0000 (+0900)
Subject: journal: remove old kernels (<3.2) support in monitoring hostname
X-Git-Tag: v258-rc1~816^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d127423ce6ec0c7274635d830e35a394c4bb2ab1;p=thirdparty%2Fsystemd.git

journal: remove old kernels (<3.2) support in monitoring hostname

Similar to cc983fc9dceb989f2cd7cb5ae393630b6c8c2f12.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index a33c4b28242..24859f3804f 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2031,17 +2031,8 @@ static int server_open_hostname(Server *s) {
                 return log_error_errno(errno, "Failed to open /proc/sys/kernel/hostname: %m");
 
         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_errno(r, "Failed to register hostname fd in event loop, ignoring: %m");
-                        s->hostname_fd = safe_close(s->hostname_fd);
-                        return 0;
-                }
-
+        if (r < 0)
                 return log_error_errno(r, "Failed to register hostname fd in event loop: %m");
-        }
 
         r = sd_event_source_set_priority(s->hostname_event_source, SD_EVENT_PRIORITY_IMPORTANT-10);
         if (r < 0)