From 58b21586725e45738762f011afe86566373e66e6 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Oct 18 2024 18:33:15 +0000 Subject: Fix error when upgrading from v255 and networkd can't be restarted --- diff --git a/0001-keep-on-using-DBus-as-fallback-if-varlink-is-not-ava.patch b/0001-keep-on-using-DBus-as-fallback-if-varlink-is-not-ava.patch new file mode 100644 index 0000000..5873bde --- /dev/null +++ b/0001-keep-on-using-DBus-as-fallback-if-varlink-is-not-ava.patch @@ -0,0 +1,25 @@ +From 0841bbf69ed2b7d623c09a8e35ddf563a2acfb18 Mon Sep 17 00:00:00 2001 +From: Matteo Croce +Date: Fri, 18 Oct 2024 18:44:13 +0200 +Subject: [PATCH] keep on using DBus as fallback if varlink is not available + +--- + src/network/networkctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/networkctl.c b/src/network/networkctl.c +index a447c39..f3d7f24 100644 +--- a/src/network/networkctl.c ++++ b/src/network/networkctl.c +@@ -173,7 +173,7 @@ int acquire_bus(sd_bus **ret) { + if (networkd_is_running()) { + r = varlink_connect_networkd(/* ret_varlink = */ NULL); + if (r < 0) +- return r; ++ log_warning("Varlink connection failed, fallback to D-Bus."); + } else + log_warning("systemd-networkd is not running, output might be incomplete."); + +-- +2.47.0 + diff --git a/systemd.spec b/systemd.spec index 9923a11..28f2b20 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.1}%{?dist} +Release: %{?release_override}%{!?release_override:1.2}%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -142,6 +142,9 @@ Patch0901: https://github.com/systemd/systemd/pull/34251.patch # core: Add support for PrivateUsers=identity Patch0902: https://github.com/systemd/systemd/pull/34400.patch +# Fix error when upgrading from v255 +Patch0903: 0001-keep-on-using-DBus-as-fallback-if-varlink-is-not-ava.patch + %endif %ifarch %{ix86} x86_64 aarch64 riscv64