diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-24 14:28:00 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-24 14:42:24 +0200 |
| commit | f2b6878955b1f77ea1fa87b502b13d5dbefc57f6 (patch) | |
| tree | 3fdf72d167a9e64ac16aaac52eaffa57c3cb9d13 /units | |
| parent | 8d8e945624a0080073d94941f3032b8fa3b3aa15 (diff) | |
service: introduce Type=idle and use it for gettys
Type=idle is much like Type=simple, however between the fork() and the
exec() in the child we wait until PID 1 informs us that no jobs are
left.
This is mostly a cosmetic fix to make gettys appear only after all boot
output is finished and complete.
Note that this does not impact the normal job logic as we do not delay
the completion of any jobs. We just delay the invocation of the actual
binary, and only for services that otherwise would be of Type=simple.
Diffstat (limited to 'units')
| -rw-r--r-- | units/console-getty.service.m4.in | 1 | ||||
| -rw-r--r-- | units/console-shell.service.m4.in | 1 | ||||
| -rw-r--r-- | units/emergency.service.in | 1 | ||||
| -rw-r--r-- | units/getty@.service.m4 | 1 | ||||
| -rw-r--r-- | units/rescue.service.m4.in | 1 | ||||
| -rw-r--r-- | units/serial-getty@.service.m4 | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in index 9473d61dfe..298082b3a9 100644 --- a/units/console-getty.service.m4.in +++ b/units/console-getty.service.m4.in @@ -30,6 +30,7 @@ Before=getty.target [Service] ExecStart=-/sbin/agetty --noclear -s console 115200,38400,9600 +Type=idle Restart=always RestartSec=0 UtmpIdentifier=cons diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in index 7d0da9b860..4f795e16ac 100644 --- a/units/console-shell.service.m4.in +++ b/units/console-shell.service.m4.in @@ -33,6 +33,7 @@ Environment=HOME=/root WorkingDirectory=/root ExecStart=-/sbin/sulogin ExecStopPost=-@SYSTEMCTL@ poweroff +Type=idle StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/units/emergency.service.in b/units/emergency.service.in index c1421ba22c..75007563d7 100644 --- a/units/emergency.service.in +++ b/units/emergency.service.in @@ -20,6 +20,7 @@ ExecStartPre=-/bin/plymouth quit ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.' ExecStart=-/sbin/sulogin ExecStopPost=@SYSTEMCTL@ --fail --no-block default +Type=idle StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index 17c76f5b31..431a3dd722 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -41,6 +41,7 @@ ConditionPathExists=/dev/tty0 [Service] Environment=TERM=linux ExecStart=-/sbin/agetty %I 38400 +Type=idle Restart=always RestartSec=0 UtmpIdentifier=%I diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in index c736f83478..3adfcf45bd 100644 --- a/units/rescue.service.m4.in +++ b/units/rescue.service.m4.in @@ -33,6 +33,7 @@ m4_ifdef(`TARGET_MEEGO', ExecStart=-/bin/bash -c "exec ${SINGLE}"', `ExecStart=-/sbin/sulogin')))) ExecStopPost=-@SYSTEMCTL@ --fail --no-block default +Type=idle StandardInput=tty-force StandardOutput=inherit StandardError=inherit diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index 93bc643e6b..366b2d0710 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -37,6 +37,7 @@ IgnoreOnIsolate=yes [Service] Environment=TERM=vt102 ExecStart=-/sbin/agetty -s %I 115200,38400,9600 +Type=idle Restart=always RestartSec=0 UtmpIdentifier=%I |