summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-09 04:37:13 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-09 04:37:13 +0200
commit455bb5a4bdd03d77af72d810ddc22c85a353d2e4 (patch)
tree740404011a5d83973b6ee2752e42c291589910fd
parent4627d39661ffcdd11e814650dfcc9ac3d0d0ec0b (diff)
units: connect shutdown scripts explicitly with the tty, because native units now default to /dev/null stdout otherwise
-rw-r--r--units/arch/halt.service1
-rw-r--r--units/arch/poweroff.service1
-rw-r--r--units/arch/reboot.service1
-rw-r--r--units/fedora/halt.service1
-rw-r--r--units/fedora/killall.service1
-rw-r--r--units/fedora/poweroff.service1
-rw-r--r--units/fedora/reboot.service1
-rw-r--r--units/gentoo/halt.service1
-rw-r--r--units/gentoo/killall.service1
-rw-r--r--units/gentoo/poweroff.service1
-rw-r--r--units/gentoo/reboot.service1
-rw-r--r--units/suse/halt.service1
-rw-r--r--units/suse/poweroff.service1
-rw-r--r--units/suse/reboot.service1
14 files changed, 14 insertions, 0 deletions
diff --git a/units/arch/halt.service b/units/arch/halt.service
index 96553f1ad4..87224e34b6 100644
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=RUNLEVEL=0
ExecStart=/etc/rc.shutdown
+StandardInput=tty
diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service
index d6e42e1a4b..ffa592c8f6 100644
--- a/units/arch/poweroff.service
+++ b/units/arch/poweroff.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=RUNLEVEL=0
ExecStart=/etc/rc.shutdown
+StandardInput=tty
diff --git a/units/arch/reboot.service b/units/arch/reboot.service
index b2c18842ff..934903dc6b 100644
--- a/units/arch/reboot.service
+++ b/units/arch/reboot.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=RUNLEVEL=6
ExecStart=/etc/rc.shutdown
+StandardInput=tty
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 106ac6b691..b957a3fe30 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=INIT_HALT=HALT RUNLEVEL=0
ExecStart=/etc/init.d/halt start
+StandardInput=tty
diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 8ccbbcea8e..876227697b 100644
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -15,3 +15,4 @@ OnlyByDependency=yes
Type=finish
ValidNoProcess=yes
ExecStart=/etc/init.d/killall start
+StandardInput=tty
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 2149dbf6db..76d030c041 100644
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=RUNLEVEL=0
ExecStart=/etc/init.d/halt start
+StandardInput=tty
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 31aa74e141..6a93c0b557 100644
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=RUNLEVEL=6
ExecStart=/etc/init.d/reboot start
+StandardInput=tty
diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index 56ac493881..19ead8a315 100644
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes
ExecStart=/etc/init.d/shutdown.sh
+StandardInput=tty
diff --git a/units/gentoo/killall.service b/units/gentoo/killall.service
index ce4d99ef2e..fb4b988594 100644
--- a/units/gentoo/killall.service
+++ b/units/gentoo/killall.service
@@ -15,3 +15,4 @@ OnlyByDependency=yes
Type=finish
ValidNoProcess=yes
ExecStart=/etc/init.d/killprocs start
+StandardInput=tty
diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 2ae1fd7f29..9ceb205b05 100644
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=RC_DOWN_HARDDISK=yes
ExecStart=/etc/init.d/shutdown.sh
+StandardInput=tty
diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index 353fb4bfcb..c223e6c26f 100644
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -16,3 +16,4 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a
Type=finish
ValidNoProcess=yes
ExecStart=/etc/init.d/reboot.sh
+StandardInput=tty
diff --git a/units/suse/halt.service b/units/suse/halt.service
index 40d58b36b5..54586c4204 100644
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -17,3 +17,4 @@ Type=finish
ValidNoProcess=yes
Environment=INIT_HALT=HALT RUNLEVEL=0
ExecStart=/etc/init.d/halt start
+StandardInput=tty
diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index 3da6cf1ba5..cb90874c32 100644
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -16,3 +16,4 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a
Type=finish
ValidNoProcess=yes
ExecStart=/etc/init.d/halt start
+StandardInput=tty
diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index 902648c50b..1ccacebac3 100644
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -16,3 +16,4 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a
Type=finish
ValidNoProcess=yes
ExecStart=/etc/init.d/reboot start
+StandardInput=tty