From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 26 Aug 2008 11:19:48 +0000 (+0200)
Subject: Fix dnsmasq was not stopped at shutdown
X-Git-Tag: v2.3-beta4~56^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7be0be70bcd376146f57680ed1bb2b1d31634d02;p=ipfire-2.x.git

Fix dnsmasq was not stopped at shutdown
---

diff --git a/config/rootfiles/updater/filelists/core18 b/config/rootfiles/updater/filelists/core18
index 6b9302fdc1..284bc866c2 100644
--- a/config/rootfiles/updater/filelists/core18
+++ b/config/rootfiles/updater/filelists/core18
@@ -12,6 +12,7 @@ srv/web/ipfire/cgi-bin/network.cgi
 srv/web/ipfire/cgi-bin/system.cgi
 etc/rc.d/init.d/checkfstab
 etc/rc.d/init.d/connectd
+etc/rc.d/init.d/network
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
 etc/rc.d/rcsysinit.d/S19checkfstab
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index eafdf3e9f5..172b257a78 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -106,7 +106,7 @@
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
-* git-1.5.6
+* git-1.6.0
 * glib-2.16.5
 * glibc-2.3.6
 * gmp-4.2
diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index a4f190d529..a02c585819 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -117,6 +117,9 @@ case "${DO}" in
 				/etc/rc.d/init.d/networking/red stop
 			fi
 		fi
+
+		# Stopping dnsmasq if network all networks shutdown
+		[ "${ALL}" == "1" ] && /etc/rc.d/init.d/dnsmasq stop
 		;;
 
 	restart)