upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix #1265 to use /bin/kill.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4173 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-05-18 07:08:55 +00:00
parent 0b10c8da28
commit 6e0ba733f3
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure vendored
View file

@ -760,7 +760,6 @@ ub_conf_file
UNBOUND_LOCALSTATE_DIR UNBOUND_LOCALSTATE_DIR
UNBOUND_SYSCONF_DIR UNBOUND_SYSCONF_DIR
UNBOUND_SBIN_DIR UNBOUND_SBIN_DIR
UNBOUND_BIN_DIR
EGREP EGREP
GREP GREP
CPP CPP
@ -4131,8 +4130,6 @@ fi
# #
# Determine configuration file # Determine configuration file
# the eval is to evaluate shell expansion twice # the eval is to evaluate shell expansion twice
UNBOUND_BIN_DIR=`eval echo "${bindir}"`
UNBOUND_SBIN_DIR=`eval echo "${sbindir}"` UNBOUND_SBIN_DIR=`eval echo "${sbindir}"`
UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"` UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"`

2
configure.ac
View file

@ -125,8 +125,6 @@ fi
# #
# Determine configuration file # Determine configuration file
# the eval is to evaluate shell expansion twice # 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}"` UNBOUND_SBIN_DIR=`eval echo "${sbindir}"`
AC_SUBST(UNBOUND_SBIN_DIR) AC_SUBST(UNBOUND_SBIN_DIR)
UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"` UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"`

2
contrib/unbound.service.in
View file

@ -6,7 +6,7 @@ Documentation=man:unbound(8)
WantedBy=multi-user.target WantedBy=multi-user.target
[Service] [Service]
ExecReload=@UNBOUND_BIN_DIR@/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
ExecStart=@UNBOUND_SBIN_DIR@/unbound ExecStart=@UNBOUND_SBIN_DIR@/unbound
NotifyAccess=main NotifyAccess=main
Type=notify Type=notify

3
doc/Changelog
View file

@ -1,3 +1,6 @@
18 May 2017: Wouter
- Fix #1265 to use /bin/kill.
17 May 2017: Wouter 17 May 2017: Wouter
- Fix #1265: contrib/unbound.service contains hardcoded path. - Fix #1265: contrib/unbound.service contains hardcoded path.