Fix dnsmasq was not stopped at shutdown

diff --git a/config/rootfiles/updater/filelists/core18 b/config/rootfiles/updater/filelists/core18
index 6b9302fdc1649ef23ab650ce07c02c77f51d90f5..284bc866c2a57b86150547fd96ebdd16e549b235 100644 (file)
--- 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 eafdf3e9f5adc9c8f4a50e47defe9aa4251ba1dc..172b257a78177e9864853adce96859686900709e 100644 (file)
--- 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 a4f190d529c67b6cb19e2236a895feeebd384c32..a02c585819f423a99094fd3f229a63edf86a0122 100644 (file)
--- 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)