.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=505

0001-On_s390_con3270_disable_ANSI_colour_esc.patch

@@ -1,7 +1,19 @@
 ---
- getty-generator/getty-generator.c |   31 ++++++++++++++++++-
+ rules/99-systemd.rules.in             |    2 -
- shared/util.c                     |   62 ++++++++++++++++++++++++++++++++++++--
+ src/getty-generator/getty-generator.c |    2 -
- 2 files changed, 89 insertions(+), 4 deletions(-)
+ src/shared/util.c                     |   62 ++++++++++++++++++++++++++++++++--
+ 3 files changed, 61 insertions(+), 5 deletions(-)
+
+--- systemd-208/rules/99-systemd.rules.in
++++ systemd-208/rules/99-systemd.rules.in	2014-02-05 10:34:17.346235540 +0000
+@@ -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*|3270/tty*", TAG+="systemd"
+ 
+ KERNEL=="vport*", TAG+="systemd"
  
 --- systemd-208/src/shared/util.c
 +++ systemd-208/src/shared/util.c	2014-01-31 11:54:07.222235280 +0000
@@ -97,42 +109,8 @@
          return cached_on_tty;
  }
 --- systemd-208/src/getty-generator/getty-generator.c
-+++ systemd-208/src/getty-generator/getty-generator.c	2014-01-31 13:28:44.802235532 +0000
++++ systemd-208/src/getty-generator/getty-generator.c	2014-02-05 10:41:29.502245927 +0000
-@@ -144,14 +144,43 @@ int main(int argc, char *argv[]) {
+@@ -149,9 +149,9 @@ int main(int argc, char *argv[]) {
-                                 continue;
-                         }
- 
-+                        if (strncmp(tty, "3270/tty", 8) == 0) {
-+                                int index;
-+
-+                                k = safe_atoi(tty+8, &index);
-+                                free(tty);
-+
-+                                if (k < 0)
-+                                        continue;
-+
-+                                index++;
-+                                if (asprintf(&tty, "3270/tty%d", index) < 0) {
-+                                        log_oom();
-+                                        free(active);
-+                                        r = EXIT_FAILURE;
-+                                        goto finish;
-+                                }
-+
-+                                k = add_serial_getty(tty);
-+                                free(tty);
-+
-+                                if (k < 0) {
-+                                        free(active);
-+                                        r = EXIT_FAILURE;
-+                                        goto finish;
-+                                }
-+
-+                                continue;
-+                        }
-+
-                         /* We assume that gettys on virtual terminals are
-                          * started via manual configuration and do this magic
                           * only for non-VC terminals. */
  
                          k = add_serial_getty(tty);

plymouth-quit-and-wait-for-emergency-service.patch

@@ -0,0 +1,35 @@
+--- systemd-208/units/console-shell.service.m4.in
++++ systemd-208/units/console-shell.service.m4.in	2014-02-05 11:28:31.446735287 +0000
+@@ -17,6 +17,8 @@ Before=getty.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
++ExecStartPre=-/usr/bin/plymouth quit
++ExecStartPre=-/usr/bin/plymouth --wait
+ ExecStart=-/usr/sbin/sulogin
+ ExecStopPost=-@SYSTEMCTL@ poweroff
+ Type=idle
+--- systemd-208/units/rescue.service.m4.in
++++ systemd-208/units/rescue.service.m4.in	2014-02-05 11:28:45.214235524 +0000
+@@ -16,7 +16,8 @@ Before=shutdown.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStartPre=-/bin/plymouth quit
++ExecStartPre=-/usr/bin/plymouth quit
++ExecStartPre=-/usr/bin/plymouth --wait
+ ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+ ExecStart=-/usr/sbin/sulogin
+ ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+--- systemd-208/units/emergency.service.in
++++ systemd-208/units/emergency.service.in	2014-02-05 11:28:51.782235282 +0000
+@@ -15,7 +15,8 @@ Before=shutdown.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStartPre=-/bin/plymouth quit
++ExecStartPre=-/usr/bin/plymouth quit
++ExecStartPre=-/usr/bin/plymouth --wait
+ ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+ ExecStart=-/usr/sbin/sulogin
+ ExecStopPost=@SYSTEMCTL@ --fail --no-block default

systemd.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb  5 11:19:28 UTC 2014 - werner@suse.de
+
+- Change and extend patch 
+  0001-On_s390_con3270_disable_ANSI_colour_esc.patch
+  to disable the workaround to find /dev/3270/tty1 as this now
+  should be done by a) the kernel patch
+  http://lkml.indiana.edu/hypermail/linux/kernel/1402.0/02319.html
+  and the changed udev rule 99-systemd.rules
+
 -------------------------------------------------------------------
 Sun Feb  2 08:53:17 UTC 2014 - ohering@suse.com
 

systemd.spec

@@ -268,6 +268,8 @@ Patch88:        0002-service-allow-KillMode-mixed-in-conjunction-with-PAM.patch
 Patch89:        0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch
 # PATCH-FIX-SUSE 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
 Patch90:        0001-On_s390_con3270_disable_ANSI_colour_esc.patch
+# PATCH-FIX-SUSE plymouth-quit-and-wait-for-emergency-service.patch -- Make sure that no plymouthd is locking the tty
+Patch91:        plymouth-quit-and-wait-for-emergency-service.patch
 
 # udev patches
 # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
@@ -577,9 +579,8 @@ cp %{SOURCE7} m4/
 %patch87 -p1
 %patch88 -p1
 %patch89 -p1
-%ifarch s390 s390x
 %patch90 -p1
-%endif
+%patch91 -p1
 
 # udev patches
 %patch1001 -p1