From 8522ee7975fea189e7cdaec3ace6db6e3559128a Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan.christopher.jenkins@gmail.com>
Date: Mon, 7 Aug 2017 18:30:56 +0100
Subject: [PATCH] man/systemd-getty-generator fix/update

* Containers don't use serial-getty@console.service,
  they use console-getty.service instead, and suppress
  scanning for kernel or virtualizer consoles.

* Nowadays gettys are started on *all* configured kernel consoles.

* except for the line printer console, because that's not a tty.
  (Seriously.  Search CONFIG_LP_CONSOLE).
---
 man/systemd-getty-generator.xml      | 14 ++++++++------
 units/console-getty.service.m4.in    |  2 +-
 units/container-getty@.service.m4.in |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
index 8bff3bb..3058444 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -55,12 +55,14 @@
 
     <para><filename>systemd-getty-generator</filename> is a generator
     that automatically instantiates
-    <filename>serial-getty@.service</filename> on the kernel console
-    <filename>/dev/console</filename> if that is not directed to the
-    virtual console subsystem. It will also instantiate
+    <filename>serial-getty@.service</filename> on the kernel
+    console(s), if they can function as ttys and are not provided by
+    the virtual console subsystem. It will also instantiate
     <filename>serial-getty@.service</filename> instances for
     virtualizer consoles, if execution in a virtualized environment is
-    detected. Finally, it will instantiate
+    detected. If execution in a container environment is detected, it
+    will instead enable <filename>console-getty.service</filename> for
+    <filename>/dev/console</filename>, and
     <filename>container-getty@.service</filename> instances for
     additional container pseudo TTYs as requested by the container
     manager (see <ulink
@@ -78,8 +80,8 @@
     <para><filename>systemd-getty-generator</filename> implements
     <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
 
-    <para>Further information about configuration of gettys you may
-    find in
+    <para>Further information about configuration of gettys can be
+    found in
     <ulink url="http://0pointer.de/blog/projects/serial-console.html">systemd
     for Administrators, Part XVI: Gettys on Serial Consoles (and
     Elsewhere)</ulink>.</para>
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
index d9d0cba..ecf1db1 100644
--- a/units/console-getty.service.m4.in
+++ b/units/console-getty.service.m4.in
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Console Getty
-Documentation=man:agetty(8)
+Documentation=man:agetty(8) man:systemd-getty-generator(8)
 After=systemd-user-sessions.service plymouth-quit-wait.service
 ConditionPathExists=/dev/console
 m4_ifdef(`HAVE_SYSV_COMPAT',
diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in
index fd0be86..c11daab 100644
--- a/units/container-getty@.service.m4.in
+++ b/units/container-getty@.service.m4.in
@@ -7,7 +7,8 @@
 
 [Unit]
 Description=Container Getty on /dev/pts/%I
-Documentation=man:agetty(8) man:machinectl(1)
+Documentation=man:agetty(8) man:systemd-getty-generator(8)
+Documentation=man:machinectl(1)
 After=systemd-user-sessions.service plymouth-quit-wait.service
 m4_ifdef(`HAVE_SYSV_COMPAT',
 After=rc-local.service
-- 
2.7.4