initscripts: Fix shutdown process.

References #118

diff --git a/pkgs/core/initscripts/init/serial.conf b/pkgs/core/initscripts/init/serial.conf
index 44b76fdbc9b8c203f06bfc02c5da558eac4039dc..fe554b436784a50f07ba3cc24fc4f71c88cd0d34 100644 (file)
--- 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 36805c14268d22998437287c31a5e366f0a84890..225254d91ac1cc0cb3a85b7439b293ffc1149720 100644 (file)
--- 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 7f9ae30d2fc2bd88a9a38e2cc8dafd57e1768dec..4422b694f2c45f7105da5e7d5dc3fb0c66708c8e 100644 (file)
--- 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 d6c09357d7e0ebb6c5085375d7c0571144faacab..c133a436ccdd9a6d6acd7e3c130aface4125ad30 100644 (file)
--- 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 aa139269517a838159253732cbab6bbaca1523ab..e5d2d08e0bcccaaaf687fe7c4cb841ba3f731353 100644 (file)
--- 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 ec4962c95e70071a67af5431343d7751b2f4d2b4..5db854873a3c4366215e0a3964729800f3da5909 100644 (file)
--- 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 469f46a2b273514014518fa78db348bbbf53e1e5..6437e9bc07ce6a0584e41b75b605a4b966e35323 100644 (file)
--- 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 24218be0318582d92cfaa8a381999e77c68af771..678c50e8a3d84aff299d9a08b6bf982e3c53bb67 100644 (file)
--- 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