From 371c11a95bdff33abfe520cf0663cbf30fc9f0998316d321dbcb283fb16ef9ec Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 30 Jan 2014 12:35:04 +0000 Subject: [PATCH 1/5] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=501 --- ...s390_con3270_disable_ANSI_colour_esc.patch | 89 +++++++++++++++++++ systemd-mini.changes | 7 ++ systemd-mini.spec | 5 ++ systemd.changes | 7 ++ systemd.spec | 5 ++ 5 files changed, 113 insertions(+) create mode 100644 0001-On_s390_con3270_disable_ANSI_colour_esc.patch diff --git a/0001-On_s390_con3270_disable_ANSI_colour_esc.patch b/0001-On_s390_con3270_disable_ANSI_colour_esc.patch new file mode 100644 index 0000000..e225f29 --- /dev/null +++ b/0001-On_s390_con3270_disable_ANSI_colour_esc.patch @@ -0,0 +1,89 @@ +--- systemd-208/src/shared/util.c ++++ systemd-208/src/shared/util.c 2014-01-30 12:23:20.094236656 +0000 +@@ -2967,6 +2967,7 @@ int status_vprintf(const char *status, b + struct iovec iovec[6] = {}; + int n = 0; + static bool prev_ephemeral; ++ static int cached_on_tty = -1; + + assert(format); + +@@ -2980,6 +2981,47 @@ int status_vprintf(const char *status, b + if (fd < 0) + return fd; + ++ if (_unlikely_(cached_on_tty < 0)) { ++ cached_on_tty = isatty(fd) > 0; ++ if (cached_on_tty) { ++ const char *e = getenv("TERM"); ++ if (e && (strcmp(e, "dumb") == 0 || strcmp(e, "ibm327x") == 0)) ++ cached_on_tty = 0; ++ } ++ } ++ ++ if (status && !cached_on_tty) { ++ const char *esc, *ptr; ++ esc = strchr(status, 0x1B); ++ if (esc && (ptr = strpbrk(esc, "SOFDTI*"))) { ++ switch(*ptr) { ++ case 'S': ++ status = " SKIP "; ++ break; ++ case 'O': ++ status = " OK "; ++ break; ++ case 'F': ++ status = "FAILED"; ++ break; ++ case 'D': ++ status = "DEPEND"; ++ break; ++ case 'T': ++ status = " TIME "; ++ break; ++ case 'I': ++ status = " INFO "; ++ break; ++ case '*': ++ status = " BUSY "; ++ break; ++ default: ++ break; ++ } ++ } ++ } ++ + if (ellipse) { + char *e; + size_t emax, sl; +@@ -3002,8 +3044,12 @@ int status_vprintf(const char *status, b + } + } + +- if (prev_ephemeral) +- IOVEC_SET_STRING(iovec[n++], "\r" ANSI_ERASE_TO_END_OF_LINE); ++ if (prev_ephemeral) { ++ if (cached_on_tty) ++ IOVEC_SET_STRING(iovec[n++], "\r" ANSI_ERASE_TO_END_OF_LINE); ++ else ++ IOVEC_SET_STRING(iovec[n++], "\r"); ++ } + prev_ephemeral = ephemeral; + + if (status) { +@@ -3267,8 +3313,14 @@ void columns_lines_cache_reset(int signu + bool on_tty(void) { + static int cached_on_tty = -1; + +- if (_unlikely_(cached_on_tty < 0)) ++ if (_unlikely_(cached_on_tty < 0)) { + cached_on_tty = isatty(STDOUT_FILENO) > 0; ++ if (cached_on_tty) { ++ const char *e = getenv("TERM"); ++ if (e && (strcmp(e, "dumb") == 0 || strcmp(e, "ibm327x") == 0)) ++ cached_on_tty = 0; ++ } ++ } + + return cached_on_tty; + } diff --git a/systemd-mini.changes b/systemd-mini.changes index 3967568..df17ae6 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 30 12:33:08 UTC 2014 - werner@suse.de + +- Add patch 0001-On_s390_con3270_disable_ANSI_colour_esc.patch + to strip the colouring ANSI escape sequences from the console + messages (bnc#860937) + ------------------------------------------------------------------- Thu Jan 30 08:29:00 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 33ae73a..afb1034 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -271,6 +271,8 @@ Patch87: 0001-core-introduce-new-KillMode-mixed-which-sends-SIGTER.patch Patch88: 0002-service-allow-KillMode-mixed-in-conjunction-with-PAM.patch # PATCH-FIX-UPSTREAM 0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch -- Make sure final SIGKILL actually kills everything (bnc#841544) 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 # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -580,6 +582,9 @@ cp %{SOURCE7} m4/ %patch87 -p1 %patch88 -p1 %patch89 -p1 +%ifarch s390 s390x +%patch90 -p1 +%endif # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index 3967568..df17ae6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 30 12:33:08 UTC 2014 - werner@suse.de + +- Add patch 0001-On_s390_con3270_disable_ANSI_colour_esc.patch + to strip the colouring ANSI escape sequences from the console + messages (bnc#860937) + ------------------------------------------------------------------- Thu Jan 30 08:29:00 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 07823db..565cf69 100644 --- a/systemd.spec +++ b/systemd.spec @@ -266,6 +266,8 @@ Patch87: 0001-core-introduce-new-KillMode-mixed-which-sends-SIGTER.patch Patch88: 0002-service-allow-KillMode-mixed-in-conjunction-with-PAM.patch # PATCH-FIX-UPSTREAM 0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch -- Make sure final SIGKILL actually kills everything (bnc#841544) 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 # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -575,6 +577,9 @@ cp %{SOURCE7} m4/ %patch87 -p1 %patch88 -p1 %patch89 -p1 +%ifarch s390 s390x +%patch90 -p1 +%endif # udev patches %patch1001 -p1 From f8d33896cdca07f676f34b44196b2b61db55c1d0b25468d2487899983c5198a8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 31 Jan 2014 14:28:44 +0000 Subject: [PATCH 2/5] Also for SLES12 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=503 --- ...s390_con3270_disable_ANSI_colour_esc.patch | 70 +++++++++++++++++-- systemd.changes | 10 +++ 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/0001-On_s390_con3270_disable_ANSI_colour_esc.patch b/0001-On_s390_con3270_disable_ANSI_colour_esc.patch index e225f29..2139384 100644 --- a/0001-On_s390_con3270_disable_ANSI_colour_esc.patch +++ b/0001-On_s390_con3270_disable_ANSI_colour_esc.patch @@ -1,5 +1,10 @@ +--- + getty-generator/getty-generator.c | 31 ++++++++++++++++++- + shared/util.c | 62 ++++++++++++++++++++++++++++++++++++-- + 2 files changed, 89 insertions(+), 4 deletions(-) + --- systemd-208/src/shared/util.c -+++ systemd-208/src/shared/util.c 2014-01-30 12:23:20.094236656 +0000 ++++ systemd-208/src/shared/util.c 2014-01-31 11:54:07.222235280 +0000 @@ -2967,6 +2967,7 @@ int status_vprintf(const char *status, b struct iovec iovec[6] = {}; int n = 0; @@ -8,7 +13,7 @@ assert(format); -@@ -2980,6 +2981,47 @@ int status_vprintf(const char *status, b +@@ -2980,6 +2981,51 @@ int status_vprintf(const char *status, b if (fd < 0) return fd; @@ -16,8 +21,12 @@ + cached_on_tty = isatty(fd) > 0; + if (cached_on_tty) { + const char *e = getenv("TERM"); -+ if (e && (strcmp(e, "dumb") == 0 || strcmp(e, "ibm327x") == 0)) -+ cached_on_tty = 0; ++ if (e && (strcmp(e, "dumb") == 0 || strcmp(e, "ibm327x") == 0)) { ++ char *mode = NULL; ++ int r = parse_env_file("/proc/cmdline", WHITESPACE, "conmode", &mode, NULL); ++ if (r < 0 || !mode || !streq(mode, "3270")) ++ cached_on_tty = 0; ++ } + } + } + @@ -56,7 +65,7 @@ if (ellipse) { char *e; size_t emax, sl; -@@ -3002,8 +3044,12 @@ int status_vprintf(const char *status, b +@@ -3002,8 +3048,12 @@ int status_vprintf(const char *status, b } } @@ -71,7 +80,7 @@ prev_ephemeral = ephemeral; if (status) { -@@ -3267,8 +3313,14 @@ void columns_lines_cache_reset(int signu +@@ -3267,8 +3317,14 @@ void columns_lines_cache_reset(int signu bool on_tty(void) { static int cached_on_tty = -1; @@ -80,10 +89,57 @@ cached_on_tty = isatty(STDOUT_FILENO) > 0; + if (cached_on_tty) { + const char *e = getenv("TERM"); -+ if (e && (strcmp(e, "dumb") == 0 || strcmp(e, "ibm327x") == 0)) ++ if (e && (strcmp(e, "dumb") == 0)) + cached_on_tty = 0; + } + } 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 +@@ -144,14 +144,43 @@ 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); ++ free(tty); + + if (k < 0) { +- free(tty); + free(active); + r = EXIT_FAILURE; + goto finish; diff --git a/systemd.changes b/systemd.changes index df17ae6..ffb779c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 31 14:24:35 UTC 2014 - werner@suse.de + +- Change and extend patch + 0001-On_s390_con3270_disable_ANSI_colour_esc.patch + to re-enable colouring if 3270 console was enforced on the kernel + command line as 3270 cna handle colour ANSI escape sequences. + Also let the serial getty generator find the /dev/3270/tty1 + character device (bnc#861316) + ------------------------------------------------------------------- Thu Jan 30 12:33:08 UTC 2014 - werner@suse.de From b71fa56d2655a997b76dd037dd9f8c5fed5a7db28550e0491ca27bd4b36f1977 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 3 Feb 2014 10:02:31 +0000 Subject: [PATCH 3/5] - Remove PreReq pidof from udev, nothing in this pkg uses it OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=504 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 2 +- systemd.changes | 5 +++++ systemd.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index df17ae6..d57a888 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 2 08:53:17 UTC 2014 - ohering@suse.com + +- Remove PreReq pidof from udev, nothing in this pkg uses it + ------------------------------------------------------------------- Thu Jan 30 12:33:08 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index afb1034..ffd1fce 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -354,7 +354,7 @@ Summary: A rule-based device node and kernel event manager License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq +PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 diff --git a/systemd.changes b/systemd.changes index ffb779c..85a73c4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 2 08:53:17 UTC 2014 - ohering@suse.com + +- Remove PreReq pidof from udev, nothing in this pkg uses it + ------------------------------------------------------------------- Fri Jan 31 14:24:35 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 565cf69..b216edc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -349,7 +349,7 @@ Summary: A rule-based device node and kernel event manager License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq +PreReq: /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 From 5c9ac0fc20748c48b03b9812c8348119532d39f5cd2c45399b4e7f0a436f4e43 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 5 Feb 2014 11:33:45 +0000 Subject: [PATCH 4/5] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=505 --- ...s390_con3270_disable_ANSI_colour_esc.patch | 56 ++++++------------- ...-quit-and-wait-for-emergency-service.patch | 35 ++++++++++++ systemd.changes | 10 ++++ systemd.spec | 5 +- 4 files changed, 65 insertions(+), 41 deletions(-) create mode 100644 plymouth-quit-and-wait-for-emergency-service.patch diff --git a/0001-On_s390_con3270_disable_ANSI_colour_esc.patch b/0001-On_s390_con3270_disable_ANSI_colour_esc.patch index 2139384..843894e 100644 --- a/0001-On_s390_con3270_disable_ANSI_colour_esc.patch +++ b/0001-On_s390_con3270_disable_ANSI_colour_esc.patch @@ -1,8 +1,20 @@ --- - getty-generator/getty-generator.c | 31 ++++++++++++++++++- - shared/util.c | 62 ++++++++++++++++++++++++++++++++++++-- - 2 files changed, 89 insertions(+), 4 deletions(-) + rules/99-systemd.rules.in | 2 - + src/getty-generator/getty-generator.c | 2 - + 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 @@ -2967,6 +2967,7 @@ int status_vprintf(const char *status, b @@ -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 -@@ -144,14 +144,43 @@ 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 ++++ systemd-208/src/getty-generator/getty-generator.c 2014-02-05 10:41:29.502245927 +0000 +@@ -149,9 +149,9 @@ int main(int argc, char *argv[]) { * only for non-VC terminals. */ k = add_serial_getty(tty); diff --git a/plymouth-quit-and-wait-for-emergency-service.patch b/plymouth-quit-and-wait-for-emergency-service.patch new file mode 100644 index 0000000..560f9f3 --- /dev/null +++ b/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 diff --git a/systemd.changes b/systemd.changes index 85a73c4..30031a9 100644 --- a/systemd.changes +++ b/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 diff --git a/systemd.spec b/systemd.spec index b216edc..4dfc122 100644 --- a/systemd.spec +++ b/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 From fc793b5480265fa765e9af8da7d4e87b849902ef45f04413734675957a742a5e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 5 Feb 2014 14:40:22 +0000 Subject: [PATCH 5/5] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=506 --- systemd-mini.changes | 20 ++++++++++++++++++++ systemd-mini.spec | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index d57a888..30031a9 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,8 +1,28 @@ +------------------------------------------------------------------- +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 - Remove PreReq pidof from udev, nothing in this pkg uses it +------------------------------------------------------------------- +Fri Jan 31 14:24:35 UTC 2014 - werner@suse.de + +- Change and extend patch + 0001-On_s390_con3270_disable_ANSI_colour_esc.patch + to re-enable colouring if 3270 console was enforced on the kernel + command line as 3270 cna handle colour ANSI escape sequences. + Also let the serial getty generator find the /dev/3270/tty1 + character device (bnc#861316) + ------------------------------------------------------------------- Thu Jan 30 12:33:08 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index ffd1fce..fbeba0d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -273,6 +273,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 @@ -582,9 +584,8 @@ cp %{SOURCE7} m4/ %patch87 -p1 %patch88 -p1 %patch89 -p1 -%ifarch s390 s390x %patch90 -p1 -%endif +%patch91 -p1 # udev patches %patch1001 -p1