diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-04-23 17:40:51 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-24 17:54:57 +0100 |
| commit | 812f69fee5fceef853c42960f3d90491bda8378a (patch) | |
| tree | 6e43f64f079b3436c33456ece5a65fc50d73b1c6 /meta/recipes-connectivity/bind | |
| parent | 8a92601f8a2030f7875ee1fc6f09fd8242bd7e0d (diff) | |
| download | openembedded-core-812f69fee5fceef853c42960f3d90491bda8378a.tar.gz | |
bind: add systemd support
Add systemd support for bind.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind')
| -rw-r--r-- | meta/recipes-connectivity/bind/bind/generate-rndc-key.sh | 7 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bind/bind/named.service | 22 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bind/bind_9.9.5.bb | 17 |
3 files changed, 45 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh new file mode 100644 index 0000000000..c2e88bf127 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ ! -s /etc/bind/rndc.key ]; then + echo -n "Generating /etc/bind/rndc.key:" + /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom + chown 0640 /etc/bind/rndc.key +fi diff --git a/meta/recipes-connectivity/bind/bind/named.service b/meta/recipes-connectivity/bind/bind/named.service new file mode 100644 index 0000000000..1792e414ab --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/named.service @@ -0,0 +1,22 @@ +[Unit] +Description=Berkeley Internet Name Domain (DNS) +Wants=nss-lookup.target +Before=nss-lookup.target +After=network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/sysconfig/named +PIDFile=/run/named/named.pid + +ExecStartPre=@SBINDIR@/generate-rndc-key.sh +ExecStart=@SBINDIR@/named $OPTIONS + +ExecReload=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc reload > /dev/null 2>&1 || @BASE_BINDIR@/kill -HUP $MAINPID' + +ExecStop=@BASE_BINDIR@/sh -c '@SBINDIR@/rndc stop > /dev/null 2>&1 || @BASE_BINDIR@/kill -TERM $MAINPID' + +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb index 604deb6236..053c35232d 100644 --- a/meta/recipes-connectivity/bind/bind_9.9.5.bb +++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb @@ -13,6 +13,8 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://make-etc-initd-bind-stop-work.patch \ file://mips1-not-support-opcode.diff \ file://dont-test-on-host.patch \ + file://generate-rndc-key.sh \ + file://named.service \ " SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" @@ -27,11 +29,13 @@ EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ " -inherit autotools-brokensep update-rc.d +inherit autotools-brokensep update-rc.d systemd INITSCRIPT_NAME = "bind" INITSCRIPT_PARAMS = "defaults" +SYSTEMD_SERVICE_${PN} = "named.service" + PARALLEL_MAKE = "" RDEPENDS_${PN} = "python-core" @@ -39,6 +43,7 @@ RDEPENDS_${PN} = "python-core" PACKAGES_prepend = " ${PN}-utils " FILES_${PN}-utils = "${bindir}/host ${bindir}/dig" FILES_${PN}-dev += "${bindir}/isc-config.h" +FILES_${PN} += "${sbindir}/generate-rndc-key.sh" do_install_append() { rm "${D}${bindir}/nslookup" @@ -50,6 +55,16 @@ do_install_append() { install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/" install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind" sed -i -e '1s,#!.*python,#! /usr/bin/env python,' ${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds + + # Install systemd related files + install -d ${D}${localstatedir}/cache/bind + install -d ${D}${sbindir} + install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/named.service } CONFFILES_${PN} = " \ |