[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2340d265b1a21f036a04d2ad9649bd7637eeda71

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2340d265b1a21f036a04d2ad9649bd7637eeda71

[git]

[-- Attachment #1: Type: text/plain, Size: 2341 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  2340d265b1a21f036a04d2ad9649bd7637eeda71 (commit)
      from  527bc5af18b7eefab2aac8f27a1c8be71c379b0f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2340d265b1a21f036a04d2ad9649bd7637eeda71
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 2 19:01:44 2013 +0200

    dnsmasq: Put custom arguments first.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/73/filelists/files | 1 +
 src/initscripts/init.d/dnsmasq           | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files
index a1ef1bf..b56a318 100644
--- a/config/rootfiles/core/73/filelists/files
+++ b/config/rootfiles/core/73/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/squid
 srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
 srv/web/ipfire/cgi-bin/proxy.cgi
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index a02097e..15db47c 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -50,7 +50,7 @@ case "${1}" in
 		boot_mesg "Starting Domain Name Service Proxy..."
 		
 		eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-		ARGS=
+		ARGS="$CUSTOM_ARGS"
 		[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
 		
 		echo > /var/ipfire/red/resolv.conf # Clear it
@@ -73,8 +73,6 @@ case "${1}" in
 		# Add custom forward dns zones.
 		ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
 
-		ARGS="$ARGS $CUSTOM_ARGS"
-
 		loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
 		
 		if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then


hooks/post-receive
--
IPFire 2.x development tree