Add search domain to /etc/resolv.conf at boot time

unbound does not append the local domain to the request
any more (like dnsmasq did). Therefore, the client needs
to do that if desired.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 1d5d4df902d39aa333b194c736a011c3aa7b5cd5..3d8cf8d7fa1fe9a4caf9cbbae6950b1fdd89a964 100644 (file)
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 etc/login.defs
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/localnet
 etc/rc.d/init.d/network
 etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders

diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/localnet
index c1e5b2933c339ca19512172d6e5079fae75349ee..ff374bb2b1332361da314fab331dfe53b756a205 100644 (file)
--- a/src/initscripts/init.d/localnet
+++ b/src/initscripts/init.d/localnet
@@ -15,6 +15,13 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+write_resolv_conf() {
+       (
+               [ -n "${DOMAINNAME}" ] && echo "search ${DOMAINNAME}"
+               echo "nameserver 127.0.0.1"
+       ) > /etc/resolv.conf
+}
+
 case "${1}" in
        start)
                eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
@@ -32,6 +39,9 @@ case "${1}" in
                        domainname ${DOMAINNAME}
                        evaluate_retval
                fi
+
+               # Update resolv.conf
+               write_resolv_conf
                ;;
 
        stop)