From 79853b7e6f3ae6f45ed6db76604090ee41e31d8a280a75b66bde984fc51f89aa Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Sat, 19 Nov 2022 02:13:03 +0000 Subject: [PATCH] Accepting request 1036708 from home:iznogood:branches:Base:System Note that I've been running plymouth without this patch for months on a nVidia system with and without the nVidia binary blob, and it functions perfectly - Should you choose to reject it yet again, I will follow up with a complaint to freighttrain@opensuse.org as there is no technical reason to reject this change. - Drop plymouth-keep-KillMode-none.patch: We have a new enough version of systemd now to not need this patch any more. OBS-URL: https://build.opensuse.org/request/show/1036708 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=356 --- plymouth-keep-KillMode-none.patch | 17 ----------------- plymouth.changes | 6 ++++++ plymouth.spec | 2 -- 3 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 plymouth-keep-KillMode-none.patch diff --git a/plymouth-keep-KillMode-none.patch b/plymouth-keep-KillMode-none.patch deleted file mode 100644 index 99405fb..0000000 --- a/plymouth-keep-KillMode-none.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nura plymouth-0.9.5~git20220412.e960111/systemd-units/plymouth-start.service.in plymouth-0.9.5~git20220412.e960111_new/systemd-units/plymouth-start.service.in ---- plymouth-0.9.5~git20220412.e960111/systemd-units/plymouth-start.service.in 2022-04-15 16:39:24.000000000 +0800 -+++ plymouth-0.9.5~git20220412.e960111_new/systemd-units/plymouth-start.service.in 2022-05-19 12:59:33.150307157 +0800 -@@ -6,12 +6,11 @@ - Before=systemd-ask-password-plymouth.service - ConditionKernelCommandLine=!plymouth.enable=0 - ConditionVirtualization=!container --IgnoreOnIsolate=true - - [Service] - ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session - ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash - Type=forking - RemainAfterExit=yes --KillMode=mixed -+KillMode=none - SendSIGKILL=no diff --git a/plymouth.changes b/plymouth.changes index 70e6368..e6a0eb3 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 18 20:55:23 UTC 2022 - Bjørn Lie + +- Drop plymouth-keep-KillMode-none.patch: We have a new enough + version of systemd now to not need this patch any more. + ------------------------------------------------------------------- Wed Oct 26 07:12:23 UTC 2022 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 19a78ab..ef7246b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -40,8 +40,6 @@ Patch2: plymouth-manpages.patch Patch3: plymouth-disable-fedora-logo.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 fvogt@suse.com -- Force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch -# PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none. -Patch5: plymouth-keep-KillMode-none.patch # PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 qzhao@suse.com -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted. Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch # PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 qzhao@suse.com -- Hide unuseful output when re-generate initrd.