- Fix #1265 to use /bin/kill.

git-svn-id: file:///svn/unbound/trunk@4173 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 8403d6bedc912edc7d50e3a3be94f150fcafe292..fae03df821c769eb89f848ebdd74c7275af5faa4 100755 (executable)
--- a/configure
+++ b/configure
@@ -760,7 +760,6 @@ ub_conf_file
 UNBOUND_LOCALSTATE_DIR
 UNBOUND_SYSCONF_DIR
 UNBOUND_SBIN_DIR
-UNBOUND_BIN_DIR
 EGREP
 GREP
 CPP
@@ -4131,8 +4130,6 @@ fi
 #
 # Determine configuration file
 # the eval is to evaluate shell expansion twice
-UNBOUND_BIN_DIR=`eval echo "${bindir}"`
-
 UNBOUND_SBIN_DIR=`eval echo "${sbindir}"`
 
 UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"`

diff --git a/configure.ac b/configure.ac
index 4409a26a492f303577c91a6d3676ad1dad7b4b51..d48c32666ff2290d9679f7f53bc0c6dcfffc18a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -125,8 +125,6 @@ fi
 #
 # Determine configuration file
 # the eval is to evaluate shell expansion twice
-UNBOUND_BIN_DIR=`eval echo "${bindir}"`
-AC_SUBST(UNBOUND_BIN_DIR)
 UNBOUND_SBIN_DIR=`eval echo "${sbindir}"`
 AC_SUBST(UNBOUND_SBIN_DIR)
 UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"`

diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in
index 3ada5758c48f52765eae49f3d1c180e7f1d731f8..b3856690a4ca42e6c7323c075c2252edf6bcfb1c 100644 (file)
--- a/contrib/unbound.service.in
+++ b/contrib/unbound.service.in
@@ -6,7 +6,7 @@ Documentation=man:unbound(8)
 WantedBy=multi-user.target
 
 [Service]
-ExecReload=@UNBOUND_BIN_DIR@/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 ExecStart=@UNBOUND_SBIN_DIR@/unbound
 NotifyAccess=main
 Type=notify

diff --git a/doc/Changelog b/doc/Changelog
index acf73e0b86dede69186c862cc3a2fb4ef0508d63..338c3b6e6bd2384810bf26941143425364e6d4f9 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+18 May 2017: Wouter
+       - Fix #1265 to use /bin/kill.
+
 17 May 2017: Wouter
        - Fix #1265: contrib/unbound.service contains hardcoded path.