From 0324c0ceeb33d2531bf8c2f2c212f7e9ddfc2168 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Fri, 27 Jan 2017 09:32:33 -0700
Subject: Fix named patch
---
cobbler-named.patch | 4 ++--
cobbler.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cobbler-named.patch b/cobbler-named.patch
index 327fb70..be58478 100644
--- a/cobbler-named.patch
+++ b/cobbler-named.patch
@@ -1,6 +1,6 @@
diff -up cobbler-2.8.0/cobbler/utils.py.named cobbler-2.8.0/cobbler/utils.py
--- cobbler-2.8.0/cobbler/utils.py.named 2016-11-16 12:09:20.000000000 -0700
-+++ cobbler-2.8.0/cobbler/utils.py 2017-01-24 16:54:37.617706855 -0700
++++ cobbler-2.8.0/cobbler/utils.py 2017-01-27 09:30:02.085566171 -0700
@@ -236,6 +236,16 @@ def is_mac(strdata):
return False
return bool(_re_is_mac.match(strdata) or _re_is_ibmac.match(strdata))
@@ -29,7 +29,7 @@ diff -up cobbler-2.8.0/cobbler/utils.py.named
cobbler-2.8.0/cobbler/utils.py
return "bind9"
else:
+ if is_systemd():
-+ rc = subprocess_call(logger, "/usr/bin/systemctl is-active
named-chroot", shell=False)
++ rc = subprocess_call(logger,
["/usr/bin/systemctl","is-active","named-chroot"],
shell=False)
+ if rc == 0:
+ return "named-chroot"
return "named"
diff --git a/cobbler.spec b/cobbler.spec
index f0e0307..fb05b47 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -11,7 +11,7 @@
Name: cobbler
Version: 2.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Boot server configurator
URL:
http://cobbler.github.io/
License: GPLv2+
@@ -252,6 +252,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY =
\'$RAND_SECRET\'/" /usr/share/cobbler/
%changelog
+* Fri Jan 27 2017 Orion Poplawski <orion(a)cora.nwra.com> - 2.8.0-4
+- Fix named patch
+
* Tue Jan 24 2017 Orion Poplawski <orion(a)cora.nwra.com> - 2.8.0-3
- Restart named-chroot service if used
--
cgit v1.1
https://src.fedoraproject.org/cgit/cobbler.git/commit/?h=epel7&id=032...