diff --git a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec index 9fba90373ca..01abce4cc25 100644 --- a/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec +++ b/SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec @@ -20,7 +20,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 36%{?dist} +Release: 37%{?dist} License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux @@ -98,6 +98,9 @@ popd /boot/efi/EFI/BOOT/%{grubefiname} %changelog +* Fri Oct 30 2026 Alex Cortelyou - 255-37 +- Bump release to match systemd spec. + * Tue Oct 27 2026 Suresh Babu Chalamalasetty - 255-36 - Bump release to match systemd spec. diff --git a/SPECS/systemd/10-netlink-timeout.conf b/SPECS/systemd/10-netlink-timeout.conf new file mode 100644 index 00000000000..bb6b0cc1ae2 --- /dev/null +++ b/SPECS/systemd/10-netlink-timeout.conf @@ -0,0 +1,2 @@ +[Service] +Environment=SYSTEMD_NETLINK_DEFAULT_TIMEOUT=100s diff --git a/SPECS/systemd/systemd.signatures.json b/SPECS/systemd/systemd.signatures.json index 27e5c35758d..b6f8fd8b26a 100644 --- a/SPECS/systemd/systemd.signatures.json +++ b/SPECS/systemd/systemd.signatures.json @@ -2,6 +2,7 @@ "Signatures": { "10-console-messages.conf": "6cfc12931ac75df710aa1d323cdb98592935692cd9d32260d6118f9ad03a42e2", "10-map-count.conf": "bad4f0bbf268860582402bb4131b7b3586bf1f098a8bf89a6adf503191bc8913", + "10-netlink-timeout.conf": "f3997133123bc14e5a38da6acf562a35b5a3d9e60577870960c37e19b553dbd5", "10-oomd-defaults.conf": "f7c8e9d3455bf54795063e3914956b4e15ba52f493b0f2304abef6326a80c6cb", "10-oomd-per-slice-defaults.conf": "3f0d6882312affecddfdc5a204a44c34b90c573839f2a4850a26b44f528520bd", "10-timeout-abort.conf": "ae6b234f92bc22f1201a7572b59b454c9809f33c80d13f361b9674e1801acc37", diff --git a/SPECS/systemd/systemd.spec b/SPECS/systemd/systemd.spec index fd5caae3968..b6c5062fd74 100644 --- a/SPECS/systemd/systemd.spec +++ b/SPECS/systemd/systemd.spec @@ -50,7 +50,7 @@ Version: 255 # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') %endif -Release: 36%{?dist} +Release: 37%{?dist} # FIXME - hardcode to 'stable' for now as that's what we have in our blobstore %global stable 1 @@ -104,6 +104,7 @@ Source23: sysusers.prov Source24: sysusers.generate-pre.sh Source25: 98-default-mac-none.link +Source26: 10-netlink-timeout.conf %if 0 GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable @@ -914,6 +915,8 @@ install -m 0755 -D -t %{buildroot}%{_rpmconfigdir}/ %{SOURCE24} # https://bugzilla.redhat.com/show_bug.cgi?id=2107754 install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/network/ %{SOURCE25} +install -Dm0644 -t %{buildroot}%{system_unit_dir}/systemd-networkd.service.d/ %{SOURCE26} + ln -s --relative %{buildroot}%{_bindir}/kernel-install %{buildroot}%{_sbindir}/installkernel %find_lang %{name} @@ -1263,6 +1266,9 @@ rm -f %{name}.lang # %autochangelog. So we need to continue manually maintaining the # changelog here. %changelog +* Fri Oct 30 2026 Alex Cortelyou - 255-37 +- Increase networkd's default netlink timeout to 100 seconds. + * Tue Oct 27 2026 Suresh Babu Chalamalasetty - 255-36 - Backport upstream sd-event fix for hang after ratelimit expiry (systemd/systemd#44107, commit 1a60b10)