From 67b4050188414bc18d2aa7dab0e5de1af8e6f6a7d85530d2dfd02f3571c7d108 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Thu, 29 Oct 2020 11:21:00 +0000 Subject: [PATCH] Accepting request 844849 from home:qzhao:branches:Base:System Add plymouth-ignore-serial-console.patch: Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it (bnc#1051692 bnc#1164123 bnc#1170906). OBS-URL: https://build.opensuse.org/request/show/844849 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=278 --- plymouth-ignore-serial-console.patch | 13 +++++++++++++ plymouth.changes | 8 ++++++++ plymouth.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 plymouth-ignore-serial-console.patch diff --git a/plymouth-ignore-serial-console.patch b/plymouth-ignore-serial-console.patch new file mode 100644 index 0000000..0c1dad7 --- /dev/null +++ b/plymouth-ignore-serial-console.patch @@ -0,0 +1,13 @@ +diff -Nura plymouth-0.9.5+git20200921+20778f2/src/main.c plymouth-0.9.5+git20200921+20778f2_new/src/main.c +--- plymouth-0.9.5+git20200921+20778f2/src/main.c 2020-08-31 21:10:11.000000000 +0800 ++++ plymouth-0.9.5+git20200921+20778f2_new/src/main.c 2020-10-29 18:21:35.007441834 +0800 +@@ -2260,8 +2260,7 @@ + find_system_default_splash (&state); + find_distribution_default_splash (&state); + +- if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles")) +- device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; ++ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES; + + if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") || + (getenv ("DISPLAY") != NULL)) diff --git a/plymouth.changes b/plymouth.changes index 4641b91..0432f53 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 27 06:38:44 UTC 2020 - Cliff Zhao + +- Add plymouth-ignore-serial-console.patch: + Don't output in serial console for openQA need to take serial in + the test, and yast-installation prgram has a feature to install + system through it (bnc#1051692 bnc#1164123 bnc#1170906). + ------------------------------------------------------------------- Wed Oct 7 14:53:06 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 880ebf9..fbb2b85 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -45,6 +45,8 @@ Patch2: plymouth-correct-runtime-dir.patch Patch3: plymouth-manpages.patch # PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch +# PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1051692 bnc#1164123 bnc#1170906 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it. +Patch5: plymouth-ignore-serial-console.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. Patch1000: 0001-Add-label-ft-plugin.patch # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.