!526 同步上游社区补丁

From: @hongjinghao 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong

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

@@ -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;
+ 

systemd.spec

@@ -21,7 +21,7 @@
 Name:           systemd
 Url:            https://www.freedesktop.org/wiki/Software/systemd
 Version:        249
-Release:        63
+Release:        64
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -612,6 +612,7 @@ Patch6563:      backport-Use-dummy-allocator-to-make-accesses-defined-as-per-sta
 Patch6564:      backport-rules-import-previous-SYSTEMD_READY-state-for-suspen.patch
 Patch6565:      backport-rules-go-to-the-end-of-rules-indeed-when-dm-is-suspe.patch
 Patch6566:      backport-CVE-2023-7008.patch
+Patch6567:      backport-core-add-possibility-to-not-track-certain-unit-types.patch
 
 Patch9001:      update-rtc-with-system-clock-when-shutdown.patch
 Patch9002:      udev-add-actions-while-rename-netif-failed.patch
@@ -2108,6 +2109,8 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null &&
 %{_libdir}/security/pam_systemd.so
 
 %changelog
+* Thu Jan 18 2024 hongjinghao <hongjinghao@huawei.com> - 249-64
+- add: backport-core-add-possibility-to-not-track-certain-unit-types.patch
 * Wed Dec 27 2023 wangyuhang <wangyuhang27@huawei.com> - 249-63
 - actually check authenticated flag of SOA transaction in resolved