| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 1 | From 9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ray Strode <rstrode@redhat.com> |
| 3 | Date: Tue, 25 Aug 2020 10:49:11 -0400 |
| 4 | Subject: [PATCH] systemd: switch to KillMode=mixed |
| 5 | |
| 6 | KillMode=none is deprecated, so we need to stop using it. |
| 7 | |
| 8 | For now, use `KillMode=mixed` and `IgnoreOnIsolate=true` instead. |
| 9 | |
| 10 | In the future, we should change plymouth to be able to exit and |
| 11 | start again without restarting the active animation, but that's |
| 12 | going to require some effort. |
| 13 | |
| 14 | https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 |
| 15 | |
| 16 | Upstream-Status: Backport [https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474] |
| 17 | |
| 18 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 19 | --- |
| 20 | systemd-units/plymouth-start.service.in | 3 ++- |
| 21 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 22 | |
| 23 | diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in |
| 24 | index 3d00cc6..830a62d 100644 |
| 25 | --- a/systemd-units/plymouth-start.service.in |
| 26 | +++ b/systemd-units/plymouth-start.service.in |
| 27 | @@ -6,11 +6,12 @@ After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd. |
| 28 | Before=systemd-ask-password-plymouth.service |
| 29 | ConditionKernelCommandLine=!plymouth.enable=0 |
| 30 | ConditionVirtualization=!container |
| 31 | +IgnoreOnIsolate=true |
| 32 | |
| 33 | [Service] |
| 34 | ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session |
| 35 | ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash |
| 36 | Type=forking |
| 37 | RemainAfterExit=yes |
| 38 | -KillMode=none |
| 39 | +KillMode=mixed |
| 40 | SendSIGKILL=no |
| 41 | -- |
| 42 | 2.17.1 |
| 43 | |