packages/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 fix NetworkManager restarting service on dependency failure

Browse Source 
From: @yu_boyun
Reviewed-by: @wangxp006
Signed-off-by: @wangxp006
This commit is contained in:
openeuler-ci-bot 2020-09-14 09:36:56 +08:00 committed by Gitee
commit d71faa35b8
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NetworkManager.spec
View File

@ -47,7 +47,7 @@
Name: NetworkManager Name: NetworkManager
Version: 1.26.0 Version: 1.26.0
Epoch: 1 Epoch: 1
Release: 2 Release: 3
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/
@ -55,7 +55,8 @@ Source: https://download.gnome.org/sources/NetworkManager/%{real_versi
Source1: NetworkManager.conf Source1: NetworkManager.conf
Source2: 00-server.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 # PATCH-FEATURE-FIX fix-wants-and-add-requires.patch --fix wants and add requires in the file of NetworkManager.service.in
Patch9000: fix-wants-and-add-requires.patch Patch1: fix-wants-and-add-requires.patch
Patch2: bugfix-NetworkManager-restarting-service-on-dependency-failure.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
@ -406,6 +407,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/gtk-doc/html/NetworkManager/*
%changelog %changelog
* Fri Sep 11 2020 yuboyun <yuboyun@huawei.com> - 1.26.0-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix NetworkManager restarting service on dependency failure
* Thu Sep 10 2020 hanzhijun <hanzhijun1@huawei.com> - 1.26.0-2 * Thu Sep 10 2020 hanzhijun <hanzhijun1@huawei.com> - 1.26.0-2
- solve source url problem - solve source url problem

11
bugfix-NetworkManager-restarting-service-on-dependency-failure.patch Normal file
View File

@ -0,0 +1,11 @@
--- NetworkManager-1.26.0/data/NetworkManager.service.in
+++ NetworkManager-1.26.0/data/NetworkManager.service.in
@@ -12,6 +12,8 @@
#ExecReload=/bin/kill -HUP $MAINPID
ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure
+RestartSec=10s
+
# NM doesn't want systemd to kill its children for it
KillMode=process
CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT