333dccb144
Other changes: - Removed the following patches due to being merged upstream: - resolved-bugfix-of-null-pointer-p-question-dereferencing.patch - resolved-simplify-alloc-size-calculation.patch - resolved-do-not-allocate-packets-with-minimum-size.patch - Updated the following patches to work with 234: - fix-getty-unit.patch - build-check-for-ln-relative.patch - fix-am-path-libgcrypt-no-found.patch - Updated ordering of remaining patches. - Reformatted remaining patches as git style patches. - Updated Upstream-Status comment in "build-check-for-ln-relative.patch" to "Denied [No desire to support building on old distributions]" Signed-off-by: Adam Duskett <aduskett@gmail.com> Tested-by: Marcus Hoffmann <m.hoffmann@caretelsol.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 7deb6387aeb07fa4300fa3cf9d6c039dabd120d7 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Mon, 31 Jul 2017 10:08:46 -0400
|
|
Subject: [PATCH] fix-getty-unit
|
|
|
|
Prefer getty to agetty in console setup systemd units
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
|
[Adam: Refresh for 234]
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
---
|
|
units/getty@.service.m4 | 5 +----
|
|
units/serial-getty@.service.m4 | 2 +-
|
|
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
|
|
index 2a84061..7ad588f 100644
|
|
--- a/units/getty@.service.m4
|
|
+++ b/units/getty@.service.m4
|
|
@@ -33,10 +33,7 @@ ConditionPathExists=/dev/tty0
|
|
|
|
[Service]
|
|
# the VT is cleared by TTYVTDisallocate
|
|
-# The '-o' option value tells agetty to replace 'login' arguments with an
|
|
-# option to preserve environment (-p), followed by '--' for safety, and then
|
|
-# the entered username.
|
|
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM
|
|
+ExecStart=-/sbin/getty -L %I 115200 vt100
|
|
Type=idle
|
|
Restart=always
|
|
RestartSec=0
|
|
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
|
|
index b7caeaf..c663612 100644
|
|
--- a/units/serial-getty@.service.m4
|
|
+++ b/units/serial-getty@.service.m4
|
|
@@ -31,7 +31,7 @@ Before=rescue.service
|
|
# The '-o' option value tells agetty to replace 'login' arguments with an
|
|
# option to preserve environment (-p), followed by '--' for safety, and then
|
|
# the entered username.
|
|
-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM
|
|
+ExecStart=-/sbin/getty -L %I 115200 vt100
|
|
Type=idle
|
|
Restart=always
|
|
UtmpIdentifier=%I
|
|
--
|
|
2.13.3
|
|
|