From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Aug 2010 17:09:25 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~135
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8642d602745a91ec741d8386743aa47ee543ba27;hp=21d7908cf365228d3facd0c2b83c49a3fb05a641

Merge branch 'master' into next
---

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index f38ed4e2af..64898bef21 100644
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core38.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent
 #var/log/seeder
 var/log/seeder/info
diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 4477762803..6f1af88338 100644
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 12
+PAK_VER    = 13
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863
+$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6
 
 install : $(TARGET)
 
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 0dfb1f4e3b..11859214b9 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -15,6 +15,11 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+# Pull custom configuration file
+if [ -e "/etc/sysconfig/dnsmasq" ]; then
+	. /etc/sysconfig/dnsmasq
+fi
+
 SHOW_SRV=1
 
 case "${1}" in
@@ -41,7 +46,8 @@ case "${1}" in
 		[ -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`"
-		
+		ARGS="$ARGS $CUSTOM_ARGS"
+
 		loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
 		
 		if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then