fix the issue that NetworkManager service does not self-heal when the dbus service is abnormal

This commit is contained in:
seuzw 2022-03-07 20:34:17 +08:00
parent 5494e55280
commit ed4bfac546
2 changed files with 41 additions and 9 deletions

View File

@ -48,7 +48,7 @@
Name: NetworkManager
Version: 1.26.2
Epoch: 1
Release: 12
Release: 13
Summary: Network Link Manager and User Applications
License: GPLv2+
URL: https://www.gnome.org/projects/NetworkManager/
@ -56,14 +56,15 @@ Source: https://download.gnome.org/sources/NetworkManager/%{real_versi
Source1: NetworkManager.conf
Source2: 00-server.conf
# PATCH-FEATURE-FIX fix-wants-and-add-requires.patch --fix wants and add requires in the file of NetworkManager.service.in
Patch1: fix-wants-and-add-requires.patch
Patch2: bugfix-NetworkManager-restarting-service-on-dependency-failure.patch
Patch3: backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch
Patch4: backport-bugfix-nmcli-field-active-show-error.patch
Patch5: backport-amend-edit-translation-of-nmcli.patch
Patch6: backport-core-fix-crash-in-nm_wildcard_match_check.patch
Patch7: backport-core-ovs-fix-leak-of-NMOvsdbPrivate-db_uuid.patch
Patch8: backport-libnm-fix-leak-and-return-failures-from-nm-client-load-connections.patch
Patch1: fix-wants-and-add-requires.patch
Patch2: bugfix-NetworkManager-restarting-service-on-dependency-failure.patch
Patch3: backport-device-fix-wrongly-considering-ipv6-may-fail-for-ipv4.patch
Patch4: backport-bugfix-nmcli-field-active-show-error.patch
Patch5: backport-amend-edit-translation-of-nmcli.patch
Patch6: backport-core-fix-crash-in-nm_wildcard_match_check.patch
Patch7: backport-core-ovs-fix-leak-of-NMOvsdbPrivate-db_uuid.patch
Patch8: backport-libnm-fix-leak-and-return-failures-from-nm-client-load-connections.patch
Patch9: bugfix-use-PartOf-replace-Requires-in-service.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
@ -435,6 +436,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/*
%changelog
* Mon Mar 7 2022 seuzw <930zhaowei@163.com> - 1.26.2-13
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix the issue that NetworkManager service does not self-heal when the dbus service is abnormal
* Fri Jan 14 2022 gaoxingwang <gaoxingwang@huawei.com> - 1.26.2-12
- Type:bugfix
- ID:NA

View File

@ -0,0 +1,25 @@
From 75e1259d22d10fe05a05c0bda5ce4d5beb5800d5 Mon Sep 17 00:00:00 2001
From: gaoxingwang <gaoxingwang@huawei.com>
Date: Sat, 26 Feb 2022 14:59:43 +0800
Subject: [PATCH] use PartOf replace Requires in service
---
data/NetworkManager.service.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index b29b634..c9a9d88 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -4,7 +4,7 @@ Documentation=man:NetworkManager(8)
Wants=network.target dbus.socket
After=network-pre.target dbus.service dbus.socket
Before=network.target @DISTRO_NETWORK_SERVICE@
-Requires=dbus.service
+PartOf=dbus.service
[Service]
Type=dbus
--
2.27.0