rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 879756 from home:qzhao:branches:Base:System

Browse Source 
Add plymouth-systemd-KillMode-mixed.patch: Backport from upstream change plymouth systemd plymouth-start.service KillMode=mixed, the old method is unsafe and deprecated (bnc#1177082, bnc#1182145).

OBS-URL: https://build.opensuse.org/request/show/879756
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=294
This commit is contained in:
Cliff Zhao 2021-03-18 01:52:32 +00:00 committed by Git OBS Bridge
parent 855cad135f
commit 23a8d7e9ec
5 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plymouth-0.9.5+git20201026+53c83cc.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cc54bbdaa3ff014a7ed63ab5bca53f070a258b1525135aca2f5d3d42a6b599a
size 6735408

3
plymouth-0.9.5+git20210222+c74b3ae.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38ac3547525353bc02f21712517e42c931ca9a1061e8f115e6e6545c449b1f2e
size 6125996

17
plymouth-systemd-KillMode-mixed.patch Normal file
View File

@ -0,0 +1,17 @@
diff -Nura plymouth-0.9.5+git20201026+53c83cc/systemd-units/plymouth-start.service.in plymouth-0.9.5+git20201026+53c83cc_new/systemd-units/plymouth-start.service.in
--- plymouth-0.9.5+git20201026+53c83cc/systemd-units/plymouth-start.service.in 2021-03-18 09:26:05.723604182 +0800
+++ plymouth-0.9.5+git20201026+53c83cc_new/systemd-units/plymouth-start.service.in 2021-03-18 09:31:18.479117212 +0800
@@ -6,11 +6,12 @@
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=none
+KillMode=mixed
SendSIGKILL=no

9
plymouth.changes
View File

@ -1,9 +1,10 @@
-------------------------------------------------------------------
Wed Feb 24 06:36:59 UTC 2021 - Cliff Zhao <qzhao@suse.com>
Wed Feb 24 08:25:42 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Update to version: 0.9.5+git20210222+c74b3ae:
Use fallback image if BGRT is not supported.
systemd: switch to KillMode=mixed(bnc#1177082, bnc#1182145).
- Add plymouth-systemd-KillMode-mixed.patch: Backport from upstream
change plymouth systemd plymouth-start.service KillMode=mixed,
the old method is unsafe and deprecated (bnc#1177082,
bnc#1182145).
-------------------------------------------------------------------
Sat Feb 13 14:25:36 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>

4
plymouth.spec
View File

@ -27,7 +27,7 @@
%define plymouth_initrd_file /boot/initrd-plymouth.img
Name: plymouth
Version: 0.9.5+git20210222+c74b3ae
Version: 0.9.5+git20201026+53c83cc
Release: 0
Summary: Graphical Boot Animation and Logger
License: GPL-2.0-or-later
@ -47,6 +47,8 @@ Patch3: plymouth-manpages.patch
Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
Patch6: plymouth-disable-fedora-logo.patch
# PATCH-FIX-UPSTREAM plymouth-systemd-KillMode-mixed.patch bnc#1177082, bnc#1182145 qzhao@suse.com -- change plymouth systemd plymouth-start.service KillMode=mixed.
Patch7: plymouth-systemd-KillMode-mixed.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.