!121 restore RemainAfterExit=yes in systemd-vconsole-setup.service

From: @extinctfire
Reviewed-by: @openeuler-basic
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2021-07-27 11:34:04 +00:00 committed by Gitee
commit 6677f9ceab
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 9fd32ff7d363945fbf8fdae0128702b995127558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 5 Mar 2020 07:11:09 +0100
Subject: [PATCH] units: restore RemainAfterExit=yes in
systemd-vconsole-setup.service
This reverts the second part of 8125e8d38e3aa099c7dce8b0161997b8842aebdc.
The first part was reverted in 750e550eba362096d56a35104c6a32631aa67b8e.
The problem starts when s-v-s.s is pulled in by something that is then pulled
in by sysinit.target. Every time a unit is started, systemd recursively checks
all dependencies, and since sysinit.target is pull in by almost anything, we'll
start s-v-s.s over and over. In particular, plymouth-start.service currently
has Wants=s-v-s.s and After=s-v-s.s.
---
units/systemd-vconsole-setup.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index f4178f495a..9042521c9d 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -16,4 +16,5 @@ ConditionPathExists=/dev/tty0
[Service]
Type=oneshot
+RemainAfterExit=yes
ExecStart=@rootlibexecdir@/systemd-vconsole-setup
--
2.23.0

View File

@ -16,7 +16,7 @@
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 243
Release: 39
Release: 40
License: MIT and LGPLv2+ and GPLv2+
Summary: System and Service Manager
@ -131,6 +131,7 @@ Patch0083: 0083-journald-rework-pid-change-handling.patch
Patch0084: 0084-journald-enforce-longer-line-length-limit-during-set.patch
Patch0085: backport-execute-Fix-migration-from-DynamicUser-yes-to-no.patch
Patch0086: 0086-fix-CVE-2021-33910.patch
Patch0087: backport-units-restore-RemainAfterExit-yes-in-systemd-vconsol.patch
#openEuler
Patch9002: 1509-fix-journal-file-descriptors-leak-problems.patch
@ -1516,6 +1517,9 @@ fi
%exclude /usr/share/man/man3/*
%changelog
* Mon Jul 26 2021 extinctfire <shenyining_00@126.com> - 243-40
- restore RemainAfterExit=yes in systemd-vconsole-setup.service
* Thu Jul 22 2021 yangmingtai <yangmingtai@huawei.com> - 243-39
- fix CVE-2021-33910