Cherry-pick upstream commit which tells systemd to restart NetworkManager if it exits with a failure

Closes: #773213

3 files changed, 35 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 636bd5ee..6b0ed96d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ network-manager (0.9.10.0-5) UNRELEASED; urgency=medium
 
   * Cherry-pick upstream commit which prevents breaking PtP TUN interfaces by
     not overriding external route metrics. (Closes: #767002)
+  * Cherry-pick upstream commit which tells systemd to restart NetworkManager
+    if it exits with a failure. (Closes: #773213)
 
  -- Michael Biebl <biebl@debian.org>  Wed, 31 Dec 2014 00:59:36 +0100
 
diff --git a/debian/patches/0016-core-tell-systemd-to-restart-NetworkManager.service-.patch b/debian/patches/0016-core-tell-systemd-to-restart-NetworkManager.service-.patch
new file mode 100644
index 00000000..50c0528c
--- /dev/null
+++ b/debian/patches/0016-core-tell-systemd-to-restart-NetworkManager.service-.patch
@@ -0,0 +1,32 @@
+From a2040e059c32021ad9c26e116364197e70721a87 Mon Sep 17 00:00:00 2001
+From: Mikko Rapeli <mikko.rapeli@iki.fi>
+Date: Mon, 15 Dec 2014 16:47:45 +0100
+Subject: [PATCH 2/2] core: tell systemd to restart NetworkManager.service if
+ it exited with failure (bgo #741587)
+
+Crashed NetworkManager.service was not restarted by systemd.
+
+Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741587
+
+(cherry picked from commit fe95185f6f9f0e3bd3a71024b8b916bca2dc397f)
+---
+ data/NetworkManager.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
+index 84a9c95..b2e61ff 100644
+--- a/data/NetworkManager.service.in
++++ b/data/NetworkManager.service.in
+@@ -7,6 +7,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
+ Type=dbus
+ BusName=org.freedesktop.NetworkManager
+ ExecStart=@sbindir@/NetworkManager --no-daemon
++Restart=on-failure
+ # NM doesn't want systemd to kill its children for it
+ KillMode=process
+ 
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 550ae5a3..12363620 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch
 0014-log-DHCLIENT-exit-status-better.patch
 0015-core-don-t-override-external-route-metrics.patch
+0016-core-tell-systemd-to-restart-NetworkManager.service-.patch