chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42e39f0
)
units: fix execution environment for a few services
author
Lennart Poettering
<lennart@poettering.net>
Tue, 18 May 2010 01:08:18 +0000
(
03:08
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 18 May 2010 01:08:18 +0000
(
03:08
+0200)
units/fedora/halt.service
patch
|
blob
|
history
units/fedora/killall.service
patch
|
blob
|
history
units/fedora/poweroff.service
patch
|
blob
|
history
units/fedora/rc-local.service
patch
|
blob
|
history
units/fedora/reboot.service
patch
|
blob
|
history
units/fedora/sysinit.service
patch
|
blob
|
history
units/getty@.service.m4
patch
|
blob
|
history
diff --git
a/units/fedora/halt.service
b/units/fedora/halt.service
index acc47b503dd667e05a001430900201c93d7e62d4..06c588fae6014afad0c95ea3f3427ad661b102a1 100644
(file)
--- a/
units/fedora/halt.service
+++ b/
units/fedora/halt.service
@@
-22,6
+22,7
@@
After=shutdown.target killall.service
[Service]
Type=finish
[Service]
Type=finish
+ValidNoProcess=yes
Environment=INIT_HALT=HALT
Environment=RUNLEVEL=0
ExecStart=/etc/init.d/halt start
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 45868dd1733b71da307ea10027201acedd1e1b0f..13bb564ad5d6b3da1e2a227ba5d9d94cc555a855 100644
(file)
--- a/
units/fedora/killall.service
+++ b/
units/fedora/killall.service
@@
-20,4
+20,5
@@
Description=Kill All Processes
[Service]
Type=finish
[Service]
Type=finish
+ValidNoProcess=yes
ExecStart=/etc/init.d/killall start
ExecStart=/etc/init.d/killall start
diff --git
a/units/fedora/poweroff.service
b/units/fedora/poweroff.service
index 758b7ca237adac9fb9d898273bf995628501f3bb..a8cd68062fb5f989d8e4724018b8333a3c77b6e7 100644
(file)
--- a/
units/fedora/poweroff.service
+++ b/
units/fedora/poweroff.service
@@
-22,5
+22,6
@@
After=shutdown.target killall.service
[Service]
Type=finish
[Service]
Type=finish
+ValidNoProcess=yes
Environment=RUNLEVEL=0
ExecStart=/etc/init.d/halt start
Environment=RUNLEVEL=0
ExecStart=/etc/init.d/halt start
diff --git
a/units/fedora/rc-local.service
b/units/fedora/rc-local.service
index 099bbabcd6086527e6808597beff4dc3e529d7fd..e8284a183af4bd2081fed57b01cdaccfd83688d0 100644
(file)
--- 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
[Service]
ExecStart=/etc/rc.local start
Type=simple
+TimeoutSec=0
+StandardInput=tty
+ValidNoProcess=yes
SysVStartPriority=99
SysVStartPriority=99
diff --git
a/units/fedora/reboot.service
b/units/fedora/reboot.service
index 9aec7aaac68a2ce986a210d3712e75ab75e54a33..da83fa067cfdf86b3f955a6f3543bc1e4527539d 100644
(file)
--- a/
units/fedora/reboot.service
+++ b/
units/fedora/reboot.service
@@
-22,5
+22,6
@@
After=shutdown.target killall.service
[Service]
Type=finish
[Service]
Type=finish
+ValidNoProcess=yes
Environment=RUNLEVEL=6
ExecStart=/etc/init.d/reboot start
Environment=RUNLEVEL=6
ExecStart=/etc/init.d/reboot start
diff --git
a/units/fedora/sysinit.service
b/units/fedora/sysinit.service
index 0d59490f90daf0fe54d6f411dac4b487267d51a6..f2098fd799a23883aae76ca8da626ae36215f597 100644
(file)
--- 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
[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 9787638de040a856d4a8d7aa2b6be848d97eeec8..ffcc42aad95ef087012a5d7fddf568f686f8d28d 100644
(file)
--- a/
units/getty@.service.m4
+++ b/
units/getty@.service.m4
@@
-27,3
+27,5
@@
After=basic.target
[Service]
Type=simple
ExecStart=GETTY %I
[Service]
Type=simple
ExecStart=GETTY %I
+Restart=restart-always
+RestartSec=0