[dnssec-trigger] Resolves: #1112248 - don't block on systemctl restart NetworkManager

[Pavel Šimerda]

commit 2073a47305bea184449c512e7d75910d00c87b09
Author: Pavel Šimerda <psimerda at redhat.com>
Date:   Mon Jun 23 15:58:41 2014 +0200

    Resolves: #1112248 - don't block on systemctl restart NetworkManager

 dnssec-trigger-0.12-nm-script.patch |    9 +++++++--
 dnssec-trigger.spec                 |    6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/dnssec-trigger-0.12-nm-script.patch b/dnssec-trigger-0.12-nm-script.patch
index 0e2404c..9720ef5 100644
--- a/dnssec-trigger-0.12-nm-script.patch
+++ b/dnssec-trigger-0.12-nm-script.patch
@@ -1,5 +1,5 @@
 diff --git a/dnssec-trigger-script.in b/dnssec-trigger-script.in
-index b572dd1..d031ffd 100644
+index b572dd1..fad887c 100644
 --- a/dnssec-trigger-script.in
 +++ b/dnssec-trigger-script.in
 @@ -6,7 +6,7 @@
@@ -146,7 +146,7 @@ index b572dd1..d031ffd 100644
          log.debug("clearing unbound configuration")
          for zone in stored_zones:
              unbound_zones.remove(zone)
-@@ -370,7 +393,10 @@ class Application:
+@@ -370,11 +393,14 @@ class Application:
          log.debug("recovering /etc/resolv.conf")
          subprocess.check_call(["chattr", "-i", "/etc/resolv.conf"])
          if not self.nm_handles_resolv_conf():
@@ -158,6 +158,11 @@ index b572dd1..d031ffd 100644
          # NetworkManager currently doesn't support explicit /etc/resolv.conf
          # write out. For now we simply restart the daemon.
          elif os.path.exists("/sys/fs/cgroup/systemd"):
+-            subprocess.check_call(["systemctl", "try-restart", "NetworkManager.service"])
++            subprocess.check_call(["systemctl", "--no-block", "try-restart", "NetworkManager.service"])
+         else:
+             subprocess.check_call(["/etc/init.d/NetworkManager", "restart"])
+ 
 @@ -387,7 +413,7 @@ class Application:
  
          subprocess.check_call(["dnssec-trigger-control", "status"], stdout=DEVNULL, stderr=DEVNULL)
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index 51f710d..40a78a2 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -3,7 +3,7 @@
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
 Version: 0.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
 Source0: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
@@ -22,6 +22,7 @@ Source2: dnssec-trigger.tmpfiles.d
 # https://bugzilla.redhat.com/show_bug.cgi?id=1105896
 # https://bugzilla.redhat.com/show_bug.cgi?id=842455
 # https://bugzilla.redhat.com/show_bug.cgi?id=1111143
+# https://bugzilla.redhat.com/show_bug.cgi?id=1112248
 Patch2: dnssec-trigger-0.12-nm-script.patch
 # Fix dnssec-triggerd.service
 #
@@ -132,6 +133,9 @@ fi
 %systemd_postun_with_restart %{name}d.service
 
 %changelog
+* Mon Jun 23 2014 Pavel Šimerda <psimerda at redhat.com> - 0.12-8
+- Resolves: #1112248 - don't block on systemctl restart NetworkManager
+
 * Mon Jun 23 2014 Pavel Šimerda <psimerda at redhat.com> - 0.12-7
 - Resolves: #1112248, #1111143 - update dnssec-trigger-script and dnssec-triggerd.service