From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 14 Apr 2025 11:46:27 +0000 (+0900)
Subject: resolve: drop code for supporting old kernels (<3.2)
X-Git-Tag: v258-rc1~823
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc983fc9dceb989f2cd7cb5ae393630b6c8c2f12;p=thirdparty%2Fsystemd.git

resolve: drop code for supporting old kernels (<3.2)

Now our baseline on the kernel is 5.4.

Note, the removed code triggered assert_return() in
sd_event_source_set_description().
---

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index ed65c24e922..12d6db3347b 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -518,13 +518,8 @@ static int manager_watch_hostname(Manager *m) {
         }
 
         r = sd_event_add_io(m->event, &m->hostname_event_source, m->hostname_fd, 0, on_hostname_change, m);
-        if (r < 0) {
-                if (r == -EPERM)
-                        /* kernels prior to 3.2 don't support polling this file. Ignore the failure. */
-                        m->hostname_fd = safe_close(m->hostname_fd);
-                else
-                        return log_error_errno(r, "Failed to add hostname event source: %m");
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to add hostname event source: %m");
 
         (void) sd_event_source_set_description(m->hostname_event_source, "hostname");