Date: Wed, 2 Jun 2021 16:03:24 GMT From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 48ac5fb485dc - main - net/isc-dhcp44-server: Fix chroot support on 13.x Message-ID: <202106021603.152G3O5K012388@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=48ac5fb485dc9271286eb93789a6bf70ba6f5f4a commit 48ac5fb485dc9271286eb93789a6bf70ba6f5f4a Author: Ryan Steinmetz <zi@FreeBSD.org> AuthorDate: 2021-06-02 16:01:50 +0000 Commit: Ryan Steinmetz <zi@FreeBSD.org> CommitDate: 2021-06-02 16:03:20 +0000 net/isc-dhcp44-server: Fix chroot support on 13.x - Bump PORTREVISION PR: 245362 --- net/isc-dhcp44-server/Makefile | 2 +- net/isc-dhcp44-server/files/isc-dhcpd.in | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile index a001eaf7993c..a8d3766f498d 100644 --- a/net/isc-dhcp44-server/Makefile +++ b/net/isc-dhcp44-server/Makefile @@ -18,7 +18,7 @@ LICENSE= MPL20 USES= gmake -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 diff --git a/net/isc-dhcp44-server/files/isc-dhcpd.in b/net/isc-dhcp44-server/files/isc-dhcpd.in index ab818f3b61b1..b92fad444b43 100644 --- a/net/isc-dhcp44-server/files/isc-dhcpd.in +++ b/net/isc-dhcp44-server/files/isc-dhcpd.in @@ -390,7 +390,10 @@ setup_chroot () eval "safe_copy \${${name}_devdir} \${_dhcpd_devdir}" fi eval "safe_copy \${${name}_conffile} \${_dhcpd_conffile}" - eval "safe_copy \${${name}_etcdir}/\$_hconf \${_dhcpd_etcdir}/\$_hconf" + # copy host.conf only if it exists + if eval "[ -f \"\${${name}_etcdir}/\$_hconf\" ]"; then + eval "safe_copy \${${name}_etcdir}/\$_hconf \${_dhcpd_etcdir}/\$_hconf" + fi eval "safe_copy \${${name}_etcdir}/\$_hosts \${_dhcpd_etcdir}/\$_hosts" # copy localtime only if it exists if eval "[ -f \"\${${name}_etcdir}/\$_ltime\" ]"; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106021603.152G3O5K012388>