summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Brueckner <brueckner@redhat.com>2014-01-31 17:08:37 +0100
committerLukas Nykryn <lnykryn@redhat.com>2014-01-31 18:16:36 +0100
commit07901fc142504efb67c07875a588933dc59a3955 (patch)
treef85566154cf37c4ec056c6aebdd8c163ecba916d
parenteb15fe5cbb782fcb6527ba4496b49eed66ba6bab (diff)
s390/getty-generator: initialize essential system terminals/consoles
Ensure to start getty programs on all essential system consoles on Linux on System z. Add these essential devices to the list of virtualization_consoles to always generate getty configurations. For the sake of completion, the list of essential consoles is: /dev/sclp_line0 - Operating system messages applet (LPAR) /dev/ttysclp0 - Integrated ASCII console applet (z/VM and LPAR) /dev/ttyS0 - Already handled by systemd (3215 console on z/VM) /dev/hvc0 - Already handled by systemd (IUCV HVC terminal on z/VM) Depending on the environment, z/VM or LPAR, only a subset of these terminals are available. See also RH BZ 860158[1] "Cannot login via Operating System Console into RHEL7 instance installed on a LPAR". This bugzilla actually blocks the installation of Linux on System z instances in LPAR mode. [1] https://bugzilla.redhat.com/show_bug.cgi?id=860158
-rw-r--r--rules/99-systemd.rules.in2
-rw-r--r--src/getty-generator/getty-generator.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index 0923de542e..021359a847 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -7,7 +7,7 @@
ACTION=="remove", GOTO="systemd_end"
-SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd"
+SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*|ttysclp*|sclp_line*", TAG+="systemd"
KERNEL=="vport*", TAG+="systemd"
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index aeb6d71d74..f352a29f99 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -97,7 +97,9 @@ int main(int argc, char *argv[]) {
static const char virtualization_consoles[] =
"hvc0\0"
"xvc0\0"
- "hvsi0\0";
+ "hvsi0\0"
+ "sclp_line0\0"
+ "ttysclp0\0";
_cleanup_free_ char *active = NULL;
const char *j;