diff --git a/README b/README index 02a3e390520..2f89fffe0b2 100644 --- a/README +++ b/README @@ -42,7 +42,8 @@ REQUIREMENTS: ≥ 4.17 for cgroup-bpf socket address hooks and /sys/power/resume_offset ≥ 4.20 for PSI (used by systemd-oomd) ≥ 5.2 for cgroup freezer and new mount API - ≥ 5.3 for bounded loops in BPF program and keyring namespacing + ≥ 5.3 for bounded loops in BPF program, keyring namespacing, + and nexthop support ≥ 5.4 for pidfd and signed Verity images ⛔ Kernel versions below 5.4 ("minimum baseline") are not supported at all, diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 1592e258eca..d2e81415c15 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -1069,12 +1069,8 @@ int manager_enumerate(Manager *m) { if (r < 0) return log_error_errno(r, "Could not enumerate neighbors: %m"); - /* NextHop support is added in kernel v5.3 (65ee00a9409f751188a8cdc0988167858eb4a536), - * and older kernels return -EOPNOTSUPP, or -EINVAL if SELinux is enabled. */ r = manager_enumerate_nexthop(m); - if (r == -EOPNOTSUPP || (r == -EINVAL && mac_selinux_enforcing())) - log_debug_errno(r, "Could not enumerate nexthops, ignoring: %m"); - else if (r < 0) + if (r < 0) return log_error_errno(r, "Could not enumerate nexthops: %m"); r = manager_enumerate_routes(m);