From 3159220b2ab0924152b81b8d35e7d19ef7ec8cf9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu, 26 Jan 2017 16:39:26 -0700
Subject: Restart named-chroot service if used
---
cobbler-named.patch | 37 +++++++++++++++++++++++++++++++++++++
cobbler.spec | 9 ++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 cobbler-named.patch
diff --git a/cobbler-named.patch b/cobbler-named.patch
new file mode 100644
index 0000000..327fb70
--- /dev/null
+++ b/cobbler-named.patch
@@ -0,0 +1,37 @@
+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
+@@ -236,6 +236,16 @@ def is_mac(strdata):
+ return False
+ return bool(_re_is_mac.match(strdata) or _re_is_ibmac.match(strdata))
+
++
++def is_systemd():
++ """
++ Return whether or not this system uses systemd
++ """
++ if os.path.exists("/usr/lib/systemd/systemd"):
++ return True
++ return False
++
++
+ def get_random_mac(api_handle,virt_type="xenpv"):
+ """
+ Generate a random MAC address.
+@@ -2251,11 +2261,15 @@ def dhcp_service_name(api):
+ else:
+ return "dhcpd"
+
+-def named_service_name(api):
++def named_service_name(api, logger=None):
+ (dist, ver) = api.os_version
+ if dist == "debian" or dist == "ubuntu":
+ return "bind9"
+ else:
++ if is_systemd():
++ rc = subprocess_call(logger, "/usr/bin/systemctl is-active
named-chroot", shell=False)
++ if rc == 0:
++ return "named-chroot"
+ return "named"
+
+ def link_distro(settings, distro):
diff --git a/cobbler.spec b/cobbler.spec
index ae47e7d..f0e0307 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -11,7 +11,7 @@
Name: cobbler
Version: 2.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Boot server configurator
URL:
http://cobbler.github.io/
License: GPLv2+
@@ -19,6 +19,9 @@ Source0:
https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%
# Make logrotate work with systemd
#
https://github.com/cobbler/cobbler/issues/1745
Patch0: cobbler-logrotate.patch
+# Handle named-chroot service
+#
https://github.com/cobbler/cobbler/pull/1748
+Patch1: cobbler-named.patch
BuildRequires: git
BuildRequires: python2-devel
@@ -104,6 +107,7 @@ of an existing system. For use with a boot-server configured with
Cobbler
%prep
%setup -q
%patch0 -p1 -b .logrotate
+%patch1 -p1 -b .named
%build
%py2_build
@@ -248,6 +252,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY =
\'$RAND_SECRET\'/" /usr/share/cobbler/
%changelog
+* Tue Jan 24 2017 Orion Poplawski <orion(a)cora.nwra.com> - 2.8.0-3
+- Restart named-chroot service if used
+
* Fri Jan 20 2017 Orion Poplawski <orion(a)cora.nwra.com> - 2.8.0-2
- Fix logrotate script for systemd (bug #1414617)
--
cgit v1.1
https://src.fedoraproject.org/cgit/cobbler.git/commit/?h=epel7&id=315...