Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / install / halt

diff --git a/config/install/halt b/config/install/halt
index bc823e3f9a925bd7151c2bc9e5a71bba634b7118..1518f7d4cb8e14d5131badbe564e21bf67c86e9f 100644 (file)
--- a/config/install/halt
+++ b/config/install/halt
@@ -1,14 +1,12 @@
 #!/bin/sh
 # Clear screen
-sleep 60
-/bin/clear
-
+/usr/bin/clear
 echo "Shutting down..."
 echo "Sending all processes the TERM signal..."
-/bin/killall5 -15
+/sbin/killall5 -15
 sleep 3
 echo "Sending all processes the KILL signal..."
-/bin/killall5 -9
+/sbin/killall5 -9
 sleep 3
 echo "Unmounting filesystems"
 /bin/umount /tmp
@@ -19,4 +17,4 @@ echo "Unmounting filesystems"
 /bin/umount /proc
 echo "Unmounting root"
 /bin/mount -n -o remount,ro /
-/bin/reboot
+/sbin/reboot -f