diff --git a/backport-units-restore-RemainAfterExit-yes-in-systemd-vconsol.patch b/backport-units-restore-RemainAfterExit-yes-in-systemd-vconsol.patch new file mode 100644 index 0000000000000000000000000000000000000000..72db99fca041e8ab29b21a37a443fc76185644b5 --- /dev/null +++ b/backport-units-restore-RemainAfterExit-yes-in-systemd-vconsol.patch @@ -0,0 +1,30 @@ +From 9fd32ff7d363945fbf8fdae0128702b995127558 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +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 + diff --git a/systemd.spec b/systemd.spec index 2f829e7e06451fcb6cf71c0b8eb469541bfb1e59..ccef2aac7abafc867fcb55c4d76bdbfeda0ee0fc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 243 -Release: 34 +Release: 35 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -119,6 +119,7 @@ Patch0069: journald-rework-end-of-line-marker-handling-to-use-a.patch Patch0070: journald-rework-pid-change-handling.patch Patch0071: journald-enforce-longer-line-length-limit-during-set.patch Patch0072: fix-CVE-2021-33910.patch +Patch0073: backport-units-restore-RemainAfterExit-yes-in-systemd-vconsol.patch #openEuler Patch9002: 1509-fix-journal-file-descriptors-leak-problems.patch @@ -1504,6 +1505,12 @@ fi %exclude /usr/share/man/man3/* %changelog +* Tue Jul 27 2021 extinctfire - 243-35 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:restore RemainAfterExit=yes in systemd-vconsole-setup.service + * Wed Jul 21 2021 yangmingtai - 243-34 - Type:cve - ID:CVE-2021-33910