diff --git a/plymouth-keep-KillMode-none.patch b/plymouth-keep-KillMode-none.patch new file mode 100644 index 0000000..99405fb --- /dev/null +++ b/plymouth-keep-KillMode-none.patch @@ -0,0 +1,17 @@ +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 5fb6770..90ce1af 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -12,14 +12,6 @@ Sun May 15 14:38:55 UTC 2022 - Hans-Peter Jansen the Watermark image file to initrd - Refresh patches to apply cleanly -------------------------------------------------------------------- -Sat May 14 05:31:03 UTC 2022 - Cliff Zhao - -- Remove plymouth-keep-KillMode-none.patch: With the iteration of - tumbleweed, system could boot with the systemd recommanding option - KillMode=mixed, So it's the time to remove this patch (bsc#1177082 - bsc#1184087 boo#1182145). - ------------------------------------------------------------------- Fri May 13 10:45:07 UTC 2022 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index 9c8909a..92d3245 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -52,6 +52,8 @@ Patch8: plymouth-quiet-dracut-build-info.patch Patch9: plymouth-watermark-config.patch # PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 qzhao@suse.com -- Enable plymouth log by default, help to resolve random appear problems. Patch10: plymouth-log-on-default.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. +Patch11: plymouth-keep-KillMode-none.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.