systemd/backport-mount-setup-don-t-need-to-mount-sys-fs-pstore-if-the.patch
hongjinghao 01effbba76 backport patches from upstream and add patches
(cherry picked from commit 7408966ed3f90de3a489251c9a5db9c0e6a884c9)
2023-03-06 14:56:02 +08:00

33 lines
1.5 KiB
Diff

From ccbb0b48c48f80a3121ff9d99f395b642a0090b5 Mon Sep 17 00:00:00 2001
From: jcg <jiangchuangang@huawei.com>
Date: Fri, 9 Dec 2022 20:45:39 +0800
Subject: [PATCH] mount-setup: don't need to mount /sys/fs/pstore if there is
no ENABLE_PSTORE
(cherry picked from commit 5e5fce3e918ebba5d0cbf0b64bb97f0eaeae70a3)
(cherry picked from commit 613994c10b19f02c0764aa1d5865730f3af99267)
(cherry picked from commit 46a7e30cb9f274763657d40193c2a03a02c687ab)
(cherry picked from commit 0e96d07e8c03e543816702b13db891924b485951)
---
src/shared/mount-setup.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index ef3527e9a7..8c7c390854 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -102,8 +102,10 @@ static const MountPoint mount_table[] = {
cg_is_legacy_wanted, MNT_IN_CONTAINER },
{ "cgroup", "/sys/fs/cgroup/systemd", "cgroup", "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV,
cg_is_legacy_wanted, MNT_FATAL|MNT_IN_CONTAINER },
+#if ENABLE_PSTORE
{ "pstore", "/sys/fs/pstore", "pstore", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
NULL, MNT_NONE },
+#endif
#if ENABLE_EFI
{ "efivarfs", "/sys/firmware/efi/efivars", "efivarfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
is_efi_boot, MNT_NONE },
--
2.27.0