[systemd-commits] rules/99-systemd.rules.in src/getty-generator

[Lukas Nykryn]

 rules/99-systemd.rules.in             |    2 +-
 src/getty-generator/getty-generator.c |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 07901fc142504efb67c07875a588933dc59a3955
Author: Hendrik Brueckner <brueckner at redhat.com>
Date:   Fri Jan 31 17:08:37 2014 +0100

    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

diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index 0923de5..021359a 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 aeb6d71..f352a29 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;