units: fix execution environment for a few services

2010-05-18 03:08:18 +02:00 · 2010-05-18 03:08:18 +02:00 · 1e3fc6541f
parent 42e39f0b32
commit 1e3fc6541f
7 changed files with 13 additions and 1 deletions
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@ -22,6 +22,7 @@ After=shutdown.target killall.service

 [Service]
 Type=finish
+ValidNoProcess=yes
 Environment=INIT_HALT=HALT
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@ -20,4 +20,5 @@ Description=Kill All Processes

 [Service]
 Type=finish
+ValidNoProcess=yes
 ExecStart=/etc/init.d/killall start
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@ -22,5 +22,6 @@ After=shutdown.target killall.service

 [Service]
 Type=finish
+ValidNoProcess=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@ -26,4 +26,7 @@ Names=rc-local.service local.service
 [Service]
 ExecStart=/etc/rc.local start
 Type=simple
+TimeoutSec=0
+StandardInput=tty
+ValidNoProcess=yes
 SysVStartPriority=99
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@ -22,5 +22,6 @@ After=shutdown.target killall.service

 [Service]
 Type=finish
+ValidNoProcess=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/init.d/reboot start
--- a/units/fedora/sysinit.service
+++ b/units/fedora/sysinit.service
@ -21,4 +21,7 @@ Before=local-fs.target remote-fs.target swap.target sockets.target

 [Service]
 ExecStart=/etc/rc.d/rc.sysinit
-Type=finish
+Type=forking
+TimeoutSec=0
+StandardInput=tty
+ValidNoProcess=yes
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@ -27,3 +27,5 @@ After=basic.target
 [Service]
 Type=simple
 ExecStart=GETTY %I
+Restart=restart-always
+RestartSec=0