From 6599f1aee5592eb4ed5d410e368d57290d0f26a8 Mon Sep 17 00:00:00 2001 From: xiusailong Date: Wed, 27 Jul 2022 17:32:40 +0800 Subject: [PATCH] recover to 30s timeout in NetworkManager-wait-online service (cherry picked from commit f7aaf9e07c59d7cfdbbfa380372e8dadde09e718) --- NetworkManager.spec | 9 ++++++- ...imeout-in-NetworkManager-wait-online.patch | 25 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 25ae6cf..dacde13 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -50,7 +50,7 @@ Name: NetworkManager Version: 1.32.12 Epoch: 1 -Release: 4 +Release: 5 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -60,6 +60,7 @@ Source2: 00-server.conf Patch1: fix-wants-and-add-requires.patch Patch2: bugfix-use-PartOf-replace-Requires-in-service.patch Patch3: bugfix-ipv6-external-route-miss.patch +Patch4: bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel @@ -477,6 +478,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Wed Jul 27 2022 gaoxingwang - 1.32.12-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:recover to 30s timeout in NetworkManager-wait-online service + * Wed Mar 9 2022 chxssg - 1.32.12-4 - Type:bugfix - ID:NA diff --git a/bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch b/bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch new file mode 100644 index 0000000..68d3a4c --- /dev/null +++ b/bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch @@ -0,0 +1,25 @@ +From bd0a0eecc71bc255c541605053efd94acceadd3e Mon Sep 17 00:00:00 2001 +From: shirely16 +Date: Mon, 14 Mar 2022 14:57:01 +0800 +Subject: [PATCH] recover to 30s timeout in NetworkManager-wait-online service + +--- + data/NetworkManager-wait-online.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in +index fda2391..26a8f25 100644 +--- a/data/NetworkManager-wait-online.service.in ++++ b/data/NetworkManager-wait-online.service.in +@@ -26,7 +26,7 @@ RemainAfterExit=yes + # gets delayed too long, then the solution is usually not to decrease + # the timeout, but to fix your setup so that the connected state + # gets reached earlier. +-Environment=NM_ONLINE_TIMEOUT=60 ++Environment=NM_ONLINE_TIMEOUT=30 + + [Install] + WantedBy=network-online.target +-- +1.8.3.1 + -- Gitee