recover to 30s timeout in NetworkManager-wait-online service

This commit is contained in:
xiusailong 2022-07-27 17:32:40 +08:00
parent 091a3c0fdf
commit f7aaf9e07c
2 changed files with 33 additions and 1 deletions

View File

@ -50,7 +50,7 @@
Name: NetworkManager Name: NetworkManager
Version: 1.32.12 Version: 1.32.12
Epoch: 1 Epoch: 1
Release: 4 Release: 5
Summary: Network Link Manager and User Applications Summary: Network Link Manager and User Applications
License: GPLv2+ License: GPLv2+
URL: https://www.gnome.org/projects/NetworkManager/ URL: https://www.gnome.org/projects/NetworkManager/
@ -60,6 +60,7 @@ Source2: 00-server.conf
Patch1: fix-wants-and-add-requires.patch Patch1: fix-wants-and-add-requires.patch
Patch2: bugfix-use-PartOf-replace-Requires-in-service.patch Patch2: bugfix-use-PartOf-replace-Requires-in-service.patch
Patch3: bugfix-ipv6-external-route-miss.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: 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 BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel
@ -477,6 +478,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/gtk-doc/html/NetworkManager/*
%changelog %changelog
* Wed Jul 27 2022 gaoxingwang <gaoxingwang1@huawei.com> - 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 <chxssg@qq.com> - 1.32.12-4 * Wed Mar 9 2022 chxssg <chxssg@qq.com> - 1.32.12-4
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

View File

@ -0,0 +1,25 @@
From bd0a0eecc71bc255c541605053efd94acceadd3e Mon Sep 17 00:00:00 2001
From: shirely16 <hanhui_0117@126.com>
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