summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-18 03:08:18 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-18 03:08:18 +0200
commit1e3fc6541f92cc1c42ba1b3a7bbe4c8c7b918156 (patch)
tree5ae08344b905c8a5d7e1f89f8732e36264a8b712 /units
parent42e39f0b326d27f6392a81a7400f9af7cf0af3ab (diff)
units: fix execution environment for a few services
Diffstat (limited to 'units')
-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/rc-local.service3
-rw-r--r--units/fedora/reboot.service1
-rw-r--r--units/fedora/sysinit.service5
-rw-r--r--units/getty@.service.m42
7 files changed, 13 insertions, 1 deletions
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index acc47b503..06c588fae 100644
--- 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
diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 45868dd17..13bb564ad 100644
--- 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
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 758b7ca23..a8cd68062 100644
--- 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
diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index 099bbabcd..e8284a183 100644
--- 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
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 9aec7aaac..da83fa067 100644
--- 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
diff --git a/units/fedora/sysinit.service b/units/fedora/sysinit.service
index 0d59490f9..f2098fd79 100644
--- 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
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 9787638de..ffcc42aad 100644
--- 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