X-Git-Url: https://roy.marples.name/git diff --git a/named b/named index df7a196..91ebc8c 100755 --- a/named +++ b/named @@ -53,7 +53,8 @@ VARS="$(resolvconf -v)" eval "${VARS}" # If our dir doesn't exist then don't do anything -NAMEDB=${NAMEDB:-/etc/namedb} +NAMEDB=/etc/namedb +[ -d "${NAMEDB}" ] || NAMEDB="/etc/bind" [ -d "${NAMEDB}" ] || exit 0 NAMEDOPTIONS="${NAMEDB}/resolvconf-options.conf" @@ -120,15 +121,6 @@ else RELOAD="yes" fi -if [ "${RELOAD}" = "yes" ]; then - # OpenRC style - if [ -x /etc/init.d/named ] ; then - /etc/init.d/named --nodeps --quiet conditionalrestart - fi - # BSD RC style - if [ -x /etc/rc.d/named ]; then - /etc/rc.d/named restart - fi -fi +[ "${RELOAD}" = "yes" ] && resolvconf -s named restart exit 0