From 32793dc3d16baa82de936f238dda4322cf7b715f Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Wed, 7 Jun 2023 18:25:25 +0800
Subject: [PATCH] Fix executable path of systemd service files

---
 bind.spec            | 5 ++++-
 named-chroot.service | 3 ++-
 named.service        | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bind.spec b/bind.spec
index f239132..52667e9 100644
--- a/bind.spec
+++ b/bind.spec
@@ -1,4 +1,4 @@
-%define anolis_release 1
+%define anolis_release 2
 # bcond_without is built by default, unless --without X is passed
 # bcond_with is built only when --with X is passed to build
 %bcond_with    SYSTEMTEST
@@ -843,6 +843,9 @@ fi;
 %doc %{_pkgdocdir}/Bv9ARM.pdf
 
 %changelog
+* Wed Jun 07 2023 Funda Wang <fundawang@yeah.net> - 32:9.18.15-2
+- Fix executable path of systemd service files
+
 * Thu May 18 2023 Funda Wang <fundawang@yeah.net> - 32:9.18.15-1
 - New version 9.18.15
 
diff --git a/named-chroot.service b/named-chroot.service
index a49df15..4c38601 100644
--- a/named-chroot.service
+++ b/named-chroot.service
@@ -17,7 +17,7 @@ EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
 PIDFile=/var/named/chroot/run/named/named.pid
 
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -t /var/named/chroot -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
+ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/bin/named-checkconf -t /var/named/chroot -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
 ExecStart=/usr/sbin/named -u named -c ${NAMEDCONF} -t /var/named/chroot $OPTIONS
 
 ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
@@ -25,6 +25,7 @@ ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/r
 ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
 
 PrivateTmp=false
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
diff --git a/named.service b/named.service
index 7cd6d34..5c32fc5 100644
--- a/named.service
+++ b/named.service
@@ -13,13 +13,14 @@ EnvironmentFile=-/etc/sysconfig/named
 Environment=KRB5_KTNAME=/etc/named.keytab
 PIDFile=/run/named/named.pid
 
-ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/sbin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
+ExecStartPre=/bin/bash -c 'if [ ! "$DISABLE_ZONE_CHECKING" == "yes" ]; then /usr/bin/named-checkconf -z "$NAMEDCONF"; else echo "Checking of zone files is disabled"; fi'
 ExecStart=/usr/sbin/named -u named -c ${NAMEDCONF} $OPTIONS
 ExecReload=/bin/sh -c 'if /usr/sbin/rndc null > /dev/null 2>&1; then /usr/sbin/rndc reload; else /bin/kill -HUP $MAINPID; fi'
 
 ExecStop=/bin/sh -c '/usr/sbin/rndc stop > /dev/null 2>&1 || /bin/kill -TERM $MAINPID'
 
 PrivateTmp=true
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target
-- 
Gitee