From: Lennart Poettering Date: Fri, 9 Jul 2010 02:37:13 +0000 (+0200) Subject: units: connect shutdown scripts explicitly with the tty, because native units now... X-Git-Tag: v2~4 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=455bb5a4bdd03d77af72d810ddc22c85a353d2e4 units: connect shutdown scripts explicitly with the tty, because native units now default to /dev/null stdout otherwise --- diff --git a/units/arch/halt.service b/units/arch/halt.service index 96553f1ad..87224e34b 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 d6e42e1a4..ffa592c8f 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 b2c18842f..934903dc6 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 106ac6b69..b957a3fe3 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 8ccbbcea8..876227697 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 2149dbf6d..76d030c04 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 31aa74e14..6a93c0b55 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 56ac49388..19ead8a31 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 ce4d99ef2..fb4b98859 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 2ae1fd7f2..9ceb205b0 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 353fb4bfc..c223e6c26 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 40d58b36b..54586c420 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 3da6cf1ba..cb90874c3 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 902648c50..1ccacebac 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