From c9011d3cc13da84e14d3b4cb719194e2e6d732b2 Mon Sep 17 00:00:00 2001 From: Pavel Šimerda Date: Jan 20 2015 11:12:35 +0000 Subject: Resolves: #1183975 - systemd cgroup check fails --- diff --git a/dnssec-trigger-0.12-nm-script.patch b/dnssec-trigger-0.12-nm-script.patch index ce584e1..07fc30e 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..b25afc9 100644 +index b572dd1..69f055d 100644 --- a/dnssec-trigger-script.in +++ b/dnssec-trigger-script.in @@ -6,17 +6,20 @@ @@ -310,9 +310,9 @@ index b572dd1..b25afc9 100644 + + log.info("Recovering {}...".format(self.resolvconf)) + if self.nm_handles_resolv_conf(): -+ if os.path.isfile(self.resolvconf_networkmanager): ++ if os.path.exists(self.resolvconf_networkmanager): + os.symlink(self.resolvconf_networkmanager, self.resolvconf) -+ elif os.path.isfile("/sys/fs/cgroup/systemd"): ++ elif os.path.exists("/sys/fs/cgroup/systemd"): + subprocess.check_call(["systemctl", "--ignore-dependencies", "try-restart", "NetworkManager.service"]) + else: + subprocess.check_call(["/etc/init.d/NetworkManager", "restart"]) diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index b5c2288..617d157 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: 16%{?dist} +Release: 17%{?dist} License: BSD Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/ Source0: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz @@ -152,6 +152,9 @@ fi %systemd_postun_with_restart %{name}d.service %changelog +* Tue Jan 20 2015 Pavel Šimerda - 0.12-17 +- Resolves: #1183975 - systemd cgroup check fails + * Tue Jan 20 2015 Pavel Šimerda - 0.12-16 - Resolves: #1165126, #1125267, #1089766, #1112248, #824219 - update