|
 |
771b4bc |
From 0b4dd49539db110d27e327a5a34b739d634f7341 Mon Sep 17 00:00:00 2001
|
|
|
771b4bc |
From: Michal Schmidt <mschmidt@redhat.com>
|
|
|
771b4bc |
Date: Fri, 18 May 2012 23:06:06 +0200
|
|
|
771b4bc |
Subject: [PATCH] F17: units: do not use Type=idle yet
|
|
|
771b4bc |
|
|
|
771b4bc |
Type=idle can delay the gettys for a long time if a service has a
|
|
|
771b4bc |
problem starting. A quite common issue is sendmail taking two minutes to
|
|
|
771b4bc |
timeout querying the hostname.
|
|
|
771b4bc |
Do not use Type=idle by default until it is at least time-limited.
|
|
|
771b4bc |
---
|
|
|
771b4bc |
units/console-getty.service.m4.in | 1 -
|
|
|
771b4bc |
units/console-shell.service.m4.in | 1 -
|
|
|
771b4bc |
units/emergency.service.in | 1 -
|
|
|
771b4bc |
units/getty@.service.m4 | 1 -
|
|
|
771b4bc |
units/rescue.service.m4.in | 1 -
|
|
|
771b4bc |
units/serial-getty@.service.m4 | 1 -
|
|
|
771b4bc |
6 files changed, 6 deletions(-)
|
|
|
771b4bc |
|
|
|
771b4bc |
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
|
|
|
771b4bc |
index 298082b..9473d61 100644
|
|
|
771b4bc |
--- a/units/console-getty.service.m4.in
|
|
|
771b4bc |
+++ b/units/console-getty.service.m4.in
|
|
|
771b4bc |
@@ -30,7 +30,6 @@ Before=getty.target
|
|
|
771b4bc |
|
|
|
771b4bc |
[Service]
|
|
|
771b4bc |
ExecStart=-/sbin/agetty --noclear -s console 115200,38400,9600
|
|
|
771b4bc |
-Type=idle
|
|
|
771b4bc |
Restart=always
|
|
|
771b4bc |
RestartSec=0
|
|
|
771b4bc |
UtmpIdentifier=cons
|
|
|
771b4bc |
diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
|
|
|
771b4bc |
index 90c7c78..b0ced10 100644
|
|
|
771b4bc |
--- a/units/console-shell.service.m4.in
|
|
|
771b4bc |
+++ b/units/console-shell.service.m4.in
|
|
|
771b4bc |
@@ -33,7 +33,6 @@ Environment=HOME=/root
|
|
|
771b4bc |
WorkingDirectory=/root
|
|
|
771b4bc |
ExecStart=-/sbin/sulogin
|
|
|
771b4bc |
ExecStopPost=-@SYSTEMCTL@ poweroff
|
|
|
771b4bc |
-Type=idle
|
|
|
771b4bc |
StandardInput=tty-force
|
|
|
771b4bc |
StandardOutput=inherit
|
|
|
771b4bc |
StandardError=inherit
|
|
|
771b4bc |
diff --git a/units/emergency.service.in b/units/emergency.service.in
|
|
|
771b4bc |
index c5492e6..11ff472 100644
|
|
|
771b4bc |
--- a/units/emergency.service.in
|
|
|
771b4bc |
+++ b/units/emergency.service.in
|
|
|
771b4bc |
@@ -20,7 +20,6 @@ ExecStartPre=-/bin/plymouth quit
|
|
|
771b4bc |
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to enter default mode.'
|
|
|
771b4bc |
ExecStart=-/sbin/sulogin
|
|
|
771b4bc |
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
|
|
|
771b4bc |
-Type=idle
|
|
|
771b4bc |
StandardInput=tty-force
|
|
|
771b4bc |
StandardOutput=inherit
|
|
|
771b4bc |
StandardError=inherit
|
|
|
771b4bc |
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
|
|
|
771b4bc |
index ca6d52e..5f16c21 100644
|
|
|
771b4bc |
--- a/units/getty@.service.m4
|
|
|
771b4bc |
+++ b/units/getty@.service.m4
|
|
|
771b4bc |
@@ -41,7 +41,6 @@ ConditionPathExists=/dev/tty0
|
|
|
771b4bc |
[Service]
|
|
|
771b4bc |
Environment=TERM=linux
|
|
|
771b4bc |
ExecStart=-/sbin/agetty %I 38400
|
|
|
771b4bc |
-Type=idle
|
|
|
771b4bc |
Restart=always
|
|
|
771b4bc |
RestartSec=0
|
|
|
771b4bc |
UtmpIdentifier=%I
|
|
|
771b4bc |
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
|
|
|
771b4bc |
index 3f44187..da4c4da 100644
|
|
|
771b4bc |
--- a/units/rescue.service.m4.in
|
|
|
771b4bc |
+++ b/units/rescue.service.m4.in
|
|
|
771b4bc |
@@ -33,7 +33,6 @@ m4_ifdef(`TARGET_MEEGO',
|
|
|
771b4bc |
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
|
|
|
771b4bc |
`ExecStart=-/sbin/sulogin'))))
|
|
|
771b4bc |
ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
|
|
|
771b4bc |
-Type=idle
|
|
|
771b4bc |
StandardInput=tty-force
|
|
|
771b4bc |
StandardOutput=inherit
|
|
|
771b4bc |
StandardError=inherit
|
|
|
771b4bc |
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
|
|
|
771b4bc |
index 3f6b142..d966f77 100644
|
|
|
771b4bc |
--- a/units/serial-getty@.service.m4
|
|
|
771b4bc |
+++ b/units/serial-getty@.service.m4
|
|
|
771b4bc |
@@ -37,7 +37,6 @@ IgnoreOnIsolate=yes
|
|
|
771b4bc |
[Service]
|
|
|
771b4bc |
Environment=TERM=vt102
|
|
|
771b4bc |
ExecStart=-/sbin/agetty -s %I 115200,38400,9600
|
|
|
771b4bc |
-Type=idle
|
|
|
771b4bc |
Restart=always
|
|
|
771b4bc |
RestartSec=0
|
|
|
771b4bc |
UtmpIdentifier=%I
|