add backport-core-add-possibility-to-not-track-certain-unit-types.patch

This commit is contained in:
hongjinghao 2024-01-18 15:53:30 +08:00
parent 93d67d899b
commit 2219d13a1e
2 changed files with 76 additions and 1 deletions

View File

@ -0,0 +1,71 @@
From 1df5612cebae9b083a7a1a36303fc677cd8ccb97 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Wed, 7 Sep 2022 17:37:34 +0200
Subject: [PATCH] core: add possibility to not track certain unit types
---
docs/ENVIRONMENT.md | 9 +++++++++
src/core/unit.c | 18 ++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md
index 32bd9598b7f43..01ee065583306 100644
--- a/docs/ENVIRONMENT.md
+++ b/docs/ENVIRONMENT.md
@@ -274,6 +274,15 @@ All tools:
it is either set to `system` or `user` depending on whether the NSS/PAM
module is called by systemd in `--system` or `--user` mode.
+* `$SYSTEMD_SUPPORT_DEVICE`, `$SYSTEMD_SUPPORT_MOUNT`, `$SYSTEMD_SUPPORT_SWAP` -
+ can be set to `0` to mark respective unit type as unsupported. Generally,
+ having less units saves system resources so these options might be useful
+ for cases where we don't need to track given unit type, e.g. `--user` manager
+ often doesn't need to deal with device or swap units because they are
+ handled by the `--system` manager (PID 1). Note that setting certain unit
+ type as unsupported may not prevent loading some units of that type if they
+ are referenced by other units of another supported type.
+
systemd-remount-fs:
* `$SYSTEMD_REMOUNT_ROOT_RW=1` — if set and no entry for the root directory
diff --git a/src/core/unit.c b/src/core/unit.c
index c8dc97b99d7bf..29b07a6e7a84d 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -22,6 +22,7 @@
#include "dbus-unit.h"
#include "dbus.h"
#include "dropin.h"
+#include "env-util.h"
#include "escape.h"
#include "execute.h"
#include "fd-util.h"
@@ -4781,11 +4782,28 @@ int unit_setup_dynamic_creds(Unit *u) {
}
bool unit_type_supported(UnitType t) {
+ static int8_t cache[_UNIT_TYPE_MAX] = {}; /* -1: disabled, 1: enabled: 0: don't know */
+ int r;
+
if (_unlikely_(t < 0))
return false;
if (_unlikely_(t >= _UNIT_TYPE_MAX))
return false;
+ if (cache[t] == 0) {
+ char *e;
+
+ e = strjoina("SYSTEMD_SUPPORT_", unit_type_to_string(t));
+
+ r = getenv_bool(ascii_strupper(e));
+ if (r < 0 && r != -ENXIO)
+ log_debug_errno(r, "Failed to parse $%s, ignoring: %m", e);
+
+ cache[t] = r == 0 ? -1 : 1;
+ }
+ if (cache[t] < 0)
+ return false;
+
if (!unit_vtable[t]->supported)
return true;

View File

@ -16,7 +16,7 @@
Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 243
Release: 73
Release: 74
License: MIT and LGPLv2+ and GPLv2+
Summary: System and Service Manager
@ -296,6 +296,7 @@ Patch0248: backport-sd-bus-switch-to-a-manual-overflow-check-in.patch
Patch0249: backport-rules-import-previous-SYSTEMD_READY-state-for-suspen.patch
Patch0250: backport-rules-go-to-the-end-of-rules-indeed-when-dm-is-suspe.patch
Patch0251: backport-CVE-2023-7008.patch
Patch0252: backport-core-add-possibility-to-not-track-certain-unit-types.patch
#openEuler
Patch9002: 1509-fix-journal-file-descriptors-leak-problems.patch
@ -1703,6 +1704,9 @@ fi
%exclude /usr/share/man/man3/*
%changelog
* Thu Jan 18 2024 hongjinghao <hongjinghao@huawei.com> - 243-74
- add: backport-core-add-possibility-to-not-track-certain-unit-types.patch
* Fri Dec 29 2023 wangyuhang <wangyuhang27@huawei.com> - 243-73
- actually check authenticated flag of SOA transaction in resolved