daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
65878a
From fa600b8b075ad4c717bd5f60fd3c6b5545cc75c5 Mon Sep 17 00:00:00 2001
65878a
From: Lennart Poettering <lennart@poettering.net>
65878a
Date: Wed, 18 Dec 2013 17:48:31 +0100
65878a
Subject: [PATCH] units: when spawning a getty configure TERM explicitly
65878a
65878a
This way we can make use of our logic to automatically determine an
65878a
appropriate TERM for a specific tty.
65878a
65878a
Conflicts:
65878a
	units/console-getty.service.m4.in
65878a
	units/container-getty@.service.m4.in
65878a
65878a
(cherry picked from commit ccf22d4a104e6ed2666d6c5b4031981a84787790)
65878a
65878a
Related: #1075729
65878a
---
65878a
 units/console-getty.service.m4.in | 2 +-
65878a
 units/getty@.service.m4           | 2 +-
65878a
 units/serial-getty@.service.m4    | 2 +-
65878a
 3 files changed, 3 insertions(+), 3 deletions(-)
65878a
65878a
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
65878a
index 2fd9dd8..8ac51a4 100644
65878a
--- a/units/console-getty.service.m4.in
65878a
+++ b/units/console-getty.service.m4.in
65878a
@@ -15,7 +15,7 @@ After=rc-local.service
65878a
 Before=getty.target
65878a
 
65878a
 [Service]
65878a
-ExecStart=-/sbin/agetty --noclear -s console 115200,38400,9600
65878a
+ExecStart=-/sbin/agetty --noclear --keep-baud console 115200,38400,9600 $TERM
65878a
 Type=idle
65878a
 Restart=always
65878a
 RestartSec=0
65878a
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
65878a
index 253da85..aa853b8 100644
65878a
--- a/units/getty@.service.m4
65878a
+++ b/units/getty@.service.m4
65878a
@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0
65878a
 
65878a
 [Service]
65878a
 # the VT is cleared by TTYVTDisallocate
65878a
-ExecStart=-/sbin/agetty --noclear %I
65878a
+ExecStart=-/sbin/agetty --noclear %I $TERM
65878a
 Type=idle
65878a
 Restart=always
65878a
 RestartSec=0
65878a
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
65878a
index aea078f..e94cdb4 100644
65878a
--- a/units/serial-getty@.service.m4
65878a
+++ b/units/serial-getty@.service.m4
65878a
@@ -22,7 +22,7 @@ Before=getty.target
65878a
 IgnoreOnIsolate=yes
65878a
 
65878a
 [Service]
65878a
-ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600
65878a
+ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600 $TERM
65878a
 Type=idle
65878a
 Restart=always
65878a
 RestartSec=0