Add umount.target to shutdown scripts

Makes sure we umount the file system before shutting down.

diff --git a/units/debian/halt.service b/units/debian/halt.service
index c539ec26263b8efe7c30a4a77620195eff45db07..6be46b56ae2c223dca570809ef28e99a68aa33bf 100644 (file)
--- a/units/debian/halt.service
+++ b/units/debian/halt.service
@@ -18,8 +18,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
-Requires=shutdown.target killall.service
-After=shutdown.target killall.service
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
@@ -27,3 +27,4 @@ RemainAfterExit=yes
 Environment=INIT_HALT=HALT
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt stop
+StandardOutput=tty

diff --git a/units/debian/killall.service b/units/debian/killall.service
index 76cd2403e15cff96f8b5ae869a18811e12779960..b1819f6cf903f01294bf20fb317ed339a8f87c74 100644 (file)
--- a/units/debian/killall.service
+++ b/units/debian/killall.service
@@ -18,8 +18,11 @@
 [Unit]
 Description=Kill All Processes
 DefaultDependencies=no
+After=shutdown.target
+RefuseManualStart=yes
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/etc/init.d/sendsigs stop
+StandardOutput=tty

diff --git a/units/debian/poweroff.service b/units/debian/poweroff.service
index bff7dc38628a8c832e39258260720a2317a2f3d2..2522e8edf55a0bb0b822a0a5df563130e655a59d 100644 (file)
--- a/units/debian/poweroff.service
+++ b/units/debian/poweroff.service
@@ -18,11 +18,12 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
-Requires=shutdown.target killall.service
-After=shutdown.target killall.service
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt stop
+StandardOutput=tty

diff --git a/units/debian/reboot.service b/units/debian/reboot.service
index 5f9fe989a3659ee2edb64c1cda6022d9a0ded54e..fedce04d28d36623cb7a7f84cc3e7962e6751b04 100644 (file)
--- a/units/debian/reboot.service
+++ b/units/debian/reboot.service
@@ -18,11 +18,12 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
-Requires=shutdown.target killall.service
-After=shutdown.target killall.service
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/init.d/reboot stop
+StandardOutput=tty