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