From 2e36df4be08c6d6c248bdccb1bddec06d89dc368 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Dec 06 2024 19:41:20 +0000 Subject: restore v255 backport to bump netlink timeout to infinity --- diff --git a/FB_only_bump_netlink_timeout_to_infinity.patch b/FB_only_bump_netlink_timeout_to_infinity.patch new file mode 100644 index 0000000..25d7eec --- /dev/null +++ b/FB_only_bump_netlink_timeout_to_infinity.patch @@ -0,0 +1,13 @@ +diff --git a/src/libsystemd/sd-netlink/netlink-internal.h b/src/libsystemd/sd-netlink/netlink-internal.h +index 891d3e8413..0fd919407a 100644 +--- a/src/libsystemd/sd-netlink/netlink-internal.h ++++ b/src/libsystemd/sd-netlink/netlink-internal.h +@@ -11,7 +11,7 @@ + #include "prioq.h" + #include "time-util.h" + +-#define NETLINK_DEFAULT_TIMEOUT_USEC ((usec_t) (25 * USEC_PER_SEC)) ++#define NETLINK_DEFAULT_TIMEOUT_USEC USEC_INFINITY + + #define NETLINK_RQUEUE_MAX 64*1024 + diff --git a/systemd.spec b/systemd.spec index 527971b..ad57d3d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -44,7 +44,7 @@ Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. Version: %{?version_override}%{!?version_override:256.7} -Release: %{?release_override}%{!?release_override:1.9}%{?dist} +Release: %{?release_override}%{!?release_override:1.10}%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -160,6 +160,9 @@ Patch0906: 0001-networkctl-Make-lldp-status-backwards-compatible-wit.patch # Revert "network/lldp: do not save LLDP neighbors under /run/systemd" Patch0907: 0001-Revert-network-lldp-do-not-save-LLDP-neighbors-under.patch +# bump networkd netlink timeout to infinity +Patch0908: FB_only_bump_netlink_timeout_to_infinity.patch + # Meta specific patches for builds from git main (1001-1100) # TODO: These should be removed once they are either merged into git main # or upstreamed