diff options
| author |   Sam James <sam@gentoo.org> | 2024-09-03 07:37:21 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-09-03 07:38:43 +0100 |
| commit | 8fd3348bf2b450370cd42764c7d9fab4ef1732a8 (patch) | |
| tree | 6812657b289e66b2694296a9ad1ac517c82736d4 /net-dns | |
| parent | www-client/firefox: add 130.0 (diff) | |
| download | gentoo-8fd3348bf2b450370cd42764c7d9fab4ef1732a8.tar.gz gentoo-8fd3348bf2b450370cd42764c7d9fab4ef1732a8.tar.bz2 gentoo-8fd3348bf2b450370cd42764c7d9fab4ef1732a8.zip | |
net-dns/bind: fix init script for non-merged-usr
named-checkconf is in /usr/bin, not /usr/sbin, now.
See upstream commit https://gitlab.isc.org/isc-projects/bind9/-/commit/4419606c9d2a52536a6dd0882ac0c7068ac27f30.
Reported at https://github.com/gentoo/gentoo/pull/25220#issuecomment-2325665084.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/bind/bind-9.18.29-r2.ebuild (renamed from net-dns/bind/bind-9.18.29-r1.ebuild) | 2 | ||||
| -rw-r--r-- | net-dns/bind/files/named.init-r15 | 6 | ||||
| -rw-r--r-- | net-dns/bind/files/named.service-r2 | 13 |
3 files changed, 17 insertions, 4 deletions
diff --git a/net-dns/bind/bind-9.18.29-r1.ebuild b/net-dns/bind/bind-9.18.29-r2.ebuild index 268786e54053..56fb07aa3d91 100644 --- a/net-dns/bind/bind-9.18.29-r1.ebuild +++ b/net-dns/bind/bind-9.18.29-r2.ebuild @@ -149,7 +149,7 @@ src_install() { fperms 0750 /etc/bind /var/bind/pri fperms 0770 /var/log/named /var/bind/{,sec,dyn} - systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_newunit "${FILESDIR}/named.service-r2" named.service dotmpfiles "${FILESDIR}"/named.conf exeinto /usr/libexec doexe "${FILESDIR}/generate-rndc-key.sh" diff --git a/net-dns/bind/files/named.init-r15 b/net-dns/bind/files/named.init-r15 index bdee10cc61e8..2bd52a773200 100644 --- a/net-dns/bind/files/named.init-r15 +++ b/net-dns/bind/files/named.init-r15 @@ -65,7 +65,7 @@ _umount() { _get_pidfile() { # as suggested in bug #107724, bug 335398#c17 [ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\ - /usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2) + /usr/bin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} | grep 'pid-file' | cut -d\" -f2) [ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/run/named/named.pid } @@ -98,7 +98,7 @@ checkconfig() { return 1 fi - /usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { + /usr/bin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} || { eerror "named-checkconf failed! Please fix your config first." return 1 } @@ -109,7 +109,7 @@ checkconfig() { checkzones() { ebegin "Checking named configuration and zones" - /usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} + /usr/bin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF#${CHROOT}} eend $? } diff --git a/net-dns/bind/files/named.service-r2 b/net-dns/bind/files/named.service-r2 new file mode 100644 index 000000000000..4ca34544fe61 --- /dev/null +++ b/net-dns/bind/files/named.service-r2 @@ -0,0 +1,13 @@ +[Unit] +Description=Internet domain name server +After=network.target + +[Service] +ExecStartPre=/usr/libexec/generate-rndc-key.sh +ExecStartPre=/usr/bin/named-checkconf -z /etc/bind/named.conf +ExecStart=/usr/sbin/named -f -u named +ExecReload=/usr/sbin/rndc reload +ExecStop=/usr/sbin/rndc stop + +[Install] +WantedBy=multi-user.target |