From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 2 Jan 2011 19:40:14 +0000 (+0100)
Subject: initscripts: Fix shutdown process.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=363227169d53226bb6b801e09a883826f6c8cd03;p=ipfire-3.x.git

initscripts: Fix shutdown process.

References #118
---

diff --git a/pkgs/core/initscripts/init/serial.conf b/pkgs/core/initscripts/init/serial.conf
index 44b76fdbc..fe554b436 100644
--- a/pkgs/core/initscripts/init/serial.conf
+++ b/pkgs/core/initscripts/init/serial.conf
@@ -15,7 +15,7 @@ author                  "IPFire Team"
 # /etc/init/tty[2-6], and changing the getty line in that file.
 
 start on serial-console-available *
-stop on starting shutdown or starting reboot
+stop on kill-all-services
 
 pre-start script
 	/sbin/securetty $DEV
diff --git a/pkgs/core/initscripts/init/shutdown.conf b/pkgs/core/initscripts/init/shutdown.conf
index 36805c142..225254d91 100644
--- a/pkgs/core/initscripts/init/shutdown.conf
+++ b/pkgs/core/initscripts/init/shutdown.conf
@@ -6,11 +6,20 @@ start on shutdown or reboot
 console output
 
 script
+	# Emit event to kill all network services
+	initctl emit kill-all-network-services
+
+	# Shutdown the network
+	initctl emit shutdown-network
+
+	# Emit event to kill all system services
+	initctl emit kill-all-services
+
 	# Exterminate any lil' process that managed to evade my merciless
 	# terminating.
 	killall5 -15 || true
 	sleep 5
-	killall5 -9 || true
+	killall5 -9 || truees
 
 	mount -n -o remount,ro / || true
 
diff --git a/pkgs/core/initscripts/init/tty1.conf b/pkgs/core/initscripts/init/tty1.conf
index 7f9ae30d2..4422b694f 100644
--- a/pkgs/core/initscripts/init/tty1.conf
+++ b/pkgs/core/initscripts/init/tty1.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on starting shutdown or starting reboot
+stop on kill-all-services
 
 respawn
 exec /sbin/agetty 9600 tty1
diff --git a/pkgs/core/initscripts/init/tty2.conf b/pkgs/core/initscripts/init/tty2.conf
index d6c09357d..c133a436c 100644
--- a/pkgs/core/initscripts/init/tty2.conf
+++ b/pkgs/core/initscripts/init/tty2.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on starting shutdown or starting reboot
+stop on kill-all-services
 
 respawn
 exec /sbin/agetty 9600 tty2
diff --git a/pkgs/core/initscripts/init/tty3.conf b/pkgs/core/initscripts/init/tty3.conf
index aa1392695..e5d2d08e0 100644
--- a/pkgs/core/initscripts/init/tty3.conf
+++ b/pkgs/core/initscripts/init/tty3.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on starting shutdown or starting reboot
+stop on kill-all-services
 
 respawn
 exec /sbin/agetty 9600 tty3
diff --git a/pkgs/core/initscripts/init/tty4.conf b/pkgs/core/initscripts/init/tty4.conf
index ec4962c95..5db854873 100644
--- a/pkgs/core/initscripts/init/tty4.conf
+++ b/pkgs/core/initscripts/init/tty4.conf
@@ -2,7 +2,7 @@ description		"Start a tty"
 author			"IPFire Team"
 
 start on stopped mountfs
-stop on starting shutdown or starting reboot
+stop on kill-all-services
 
 respawn
 exec /sbin/agetty 9600 tty4
diff --git a/pkgs/core/initscripts/init/udev.conf b/pkgs/core/initscripts/init/udev.conf
index 469f46a2b..6437e9bc0 100644
--- a/pkgs/core/initscripts/init/udev.conf
+++ b/pkgs/core/initscripts/init/udev.conf
@@ -2,7 +2,7 @@ description		"Start Udev Daemon"
 author			"IPFire Team"
 
 start on startup
-stop on shutdown or reboot
+stop on kill-all-services
 
 console output
 
diff --git a/pkgs/core/initscripts/initscripts.nm b/pkgs/core/initscripts/initscripts.nm
index 24218be03..678c50e8a 100644
--- a/pkgs/core/initscripts/initscripts.nm
+++ b/pkgs/core/initscripts/initscripts.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = initscripts
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER =
 PKG_GROUP      = System/Boot