From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 6 Jul 2013 22:09:06 +0000 (+0200)
Subject: dnsmasq: kill already old instances before start.
X-Git-Tag: v2.13-core71~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcfd54ba9b883d0776f320e93ef422a5b2c3c73d;p=people%2Fms%2Fipfire-2.x.git

dnsmasq: kill already old instances before start.
---

diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files
index b15981fb1b..fe6b73da0b 100644
--- a/config/rootfiles/core/71/filelists/files
+++ b/config/rootfiles/core/71/filelists/files
@@ -3,6 +3,7 @@ etc/issue
 var/ipfire/general-functions.pl
 var/ipfire/header.pl
 var/ipfire/menu.d/10-system.menu
+etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/wlanclient
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/wpa_supplicant.exe
diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq
index 11859214b9..1b2c0c206d 100644
--- a/src/initscripts/init.d/dnsmasq
+++ b/src/initscripts/init.d/dnsmasq
@@ -24,6 +24,9 @@ SHOW_SRV=1
 
 case "${1}" in
 	start)
+		# kill already running copy of dnsmasq...
+		killproc /usr/sbin/dnsmasq 2>&1 > /dev/null
+
 		boot_mesg "Starting Domain Name Service Proxy..."
 		
 		eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)