3 files changed, 32 insertions, 1 deletions
diff --git a/units/.gitignore b/units/.gitignore
index 6a67f3f608..5fd9ccadb1 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -9,6 +9,8 @@
 /systemd-suspend.service
 /console-getty.service
 /console-getty.service.m4
+/container-getty@.service
+/container-getty@.service.m4
 /systemd-journald.service
 /user@.service
 /systemd-logind.service
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
index 2fd9dd8478..464732c742 100644
--- a/units/console-getty.service.m4.in
+++ b/units/console-getty.service.m4.in
@@ -15,7 +15,7 @@ After=rc-local.service
 Before=getty.target
 
 [Service]
-ExecStart=-/sbin/agetty --noclear -s console 115200,38400,9600
+ExecStart=-/sbin/agetty --noclear --keep-baud console 115200,38400,9600
 Type=idle
 Restart=always
 RestartSec=0
diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in
new file mode 100644
index 0000000000..abc58cbbcb
--- /dev/null
+++ b/units/container-getty@.service.m4.in
@@ -0,0 +1,29 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Container Getty on /dev/pts/%I
+Documentation=man:agetty(8) man:machinectl(1)
+After=systemd-user-sessions.service plymouth-quit-wait.service
+m4_ifdef(`HAVE_SYSV_COMPAT',
+After=rc-local.service
+)m4_dnl
+Before=getty.target
+IgnoreOnIsolate=yes
+
+[Service]
+ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600
+Type=idle
+Restart=always
+RestartSec=0
+UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
+KillMode=process
+IgnoreSIGPIPE=no
+SendSIGHUP=yes