From ba31a4ba1a763b8d75e9aa61fcccd0af43733cc0 Mon Sep 17 00:00:00 2001 From: yu_boyun <1215979730@qq.com> Date: Fri, 11 Sep 2020 11:51:12 +0800 Subject: [PATCH] fix NetworkManager restarting service on dependency failure --- NetworkManager.spec | 11 +++++++++-- ...ger-restarting-service-on-dependency-failure.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 bugfix-NetworkManager-restarting-service-on-dependency-failure.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 6e4067d..b3739e0 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -47,7 +47,7 @@ Name: NetworkManager Version: 1.26.2 Epoch: 1 -Release: 1 +Release: 2 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -55,7 +55,8 @@ 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 -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: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel @@ -406,6 +407,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Fri Sep 11 2020 yuboyun - 1.26.2-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix NetworkManager restarting service on dependency failure + * Thu Aug 27 2020 yuboyun - 1.26.2-1 - update to 1.26.2 diff --git a/bugfix-NetworkManager-restarting-service-on-dependency-failure.patch b/bugfix-NetworkManager-restarting-service-on-dependency-failure.patch new file mode 100644 index 0000000..64802a9 --- /dev/null +++ b/bugfix-NetworkManager-restarting-service-on-dependency-failure.patch @@ -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 -- Gitee