Added dnsmasq patch by heiner

diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
index 7a60a7f037df241cb803c6dc63b788e12ad2e11e..341448d3ed72413b2e0c33d8bbed730f8f0c69c6 100644 (file)
--- a/config/rootfiles/updater/filelists/other
+++ b/config/rootfiles/updater/filelists/other
@@ -1,3 +1,4 @@
+etc/init.d/dnsmasq
 etc/httpd/conf/loadmodule.conf
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/udev/dvb.sh

diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 78b7879ad2f02f6ee1e7cc2fa3aaf24369571669..eaa55cef923a30f1f5780495613251ec5550c735 100644 (file)
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -36,6 +36,8 @@ case "${1}" in
                fi
                [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
                
+               ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`"
+               
                loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
                
                if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then