daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From c37bc5ac3a7282cccd090d20a3cf7120e31c4ee5 Mon Sep 17 00:00:00 2001
803fb7
From: Jan Pazdziora <jpazdziora@redhat.com>
803fb7
Date: Fri, 13 Mar 2015 12:57:18 +0100
803fb7
Subject: [PATCH] console-getty.service: don't start when /dev/console is
803fb7
 missing
803fb7
803fb7
Create minimal image which runs systemd
803fb7
803fb7
   FROM rhel7.1
803fb7
   RUN yum install -y /usr/bin/ps
803fb7
   ENV container docker
803fb7
   CMD [ "/usr/sbin/init" ]
803fb7
803fb7
When you run the container without -t, the process
803fb7
803fb7
   /sbin/agetty --noclear --keep-baud console 115200 38400 9600
803fb7
803fb7
is not happy and checking the journal in the container, there is a stream of
803fb7
803fb7
Mar 13 04:50:15 11bf07f59fff agetty[66]: /dev/console: No such file or directory
803fb7
Mar 13 04:50:25 11bf07f59fff systemd[1]: console-getty.service holdoff time over, scheduling restart.
803fb7
Mar 13 04:50:25 11bf07f59fff systemd[1]: Stopping Console Getty...
803fb7
Mar 13 04:50:25 11bf07f59fff systemd[1]: Starting Console Getty...
803fb7
Mar 13 04:50:25 11bf07f59fff systemd[1]: Started Console Getty.
803fb7
Mar 13 04:50:25 11bf07f59fff agetty[67]: /dev/console: No such file or directory
803fb7
Mar 13 04:50:35 11bf07f59fff systemd[1]: console-getty.service holdoff time over, scheduling restart.
803fb7
Mar 13 04:50:35 11bf07f59fff systemd[1]: Stopping Console Getty...
803fb7
Mar 13 04:50:35 11bf07f59fff systemd[1]: Starting Console Getty...
803fb7
Mar 13 04:50:35 11bf07f59fff systemd[1]: Started Console Getty.
803fb7
Mar 13 04:50:35 11bf07f59fff agetty[74]: /dev/console: No such file or directory
803fb7
Mar 13 04:50:45 11bf07f59fff systemd[1]: console-getty.service holdoff time over, scheduling restart.
803fb7
Mar 13 04:50:45 11bf07f59fff systemd[1]: Stopping Console Getty...
803fb7
Mar 13 04:50:45 11bf07f59fff systemd[1]: Starting Console Getty...
803fb7
803fb7
(cherry picked from commit 1b41981d9a62443d566df6bcabc1b5024e9f5e4a)
803fb7
803fb7
Cherry-picked from: 77d83ce
803fb7
Resolves: #1222517
803fb7
---
803fb7
 units/console-getty.service.m4.in | 1 +
803fb7
 1 file changed, 1 insertion(+)
803fb7
803fb7
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
803fb7
index 8ac51a471..413d94094 100644
803fb7
--- a/units/console-getty.service.m4.in
803fb7
+++ b/units/console-getty.service.m4.in
803fb7
@@ -9,6 +9,7 @@
803fb7
 Description=Console Getty
803fb7
 Documentation=man:agetty(8)
803fb7
 After=systemd-user-sessions.service plymouth-quit-wait.service
803fb7
+ConditionPathExists=/dev/console
803fb7
 m4_ifdef(`HAVE_SYSV_COMPAT',
803fb7
 After=rc-local.service
803fb7
 )m4_dnl