allow more inodes in /dev and /tmp
(cherry picked from commit fe3edac4ef60ea93e78641807015438778afc83c)
This commit is contained in:
parent
96da595aba
commit
a02b2eef9c
@ -0,0 +1,30 @@
|
||||
From e98d0662ffbffe2c60492be6b4f5d579038d3282 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||
Date: Thu, 9 Dec 2021 10:09:17 +0100
|
||||
Subject: [PATCH 1/2] Bump the max number of inodes for /dev to a million
|
||||
|
||||
4c733d3046942984c5f73b40c3af39cc218c103f shows that 95k can be used easily on a large
|
||||
system. Let's bump it up even more so that we have some "breathing room".
|
||||
---
|
||||
src/shared/mount-util.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h
|
||||
index 3622170297..ce73aebd4b 100644
|
||||
--- a/src/shared/mount-util.h
|
||||
+++ b/src/shared/mount-util.h
|
||||
@@ -11,9 +11,9 @@
|
||||
#include "errno-util.h"
|
||||
#include "macro.h"
|
||||
|
||||
-/* 4MB for contents of regular files, 64k inodes for directories, symbolic links and device specials, using
|
||||
+/* 4MB for contents of regular files, 1m inodes for directories, symbolic links and device nodes, using
|
||||
* large storage array systems as a baseline */
|
||||
-#define TMPFS_LIMITS_DEV ",size=4m,nr_inodes=64k"
|
||||
+#define TMPFS_LIMITS_DEV ",size=4m,nr_inodes=1m"
|
||||
|
||||
/* Very little, if any use expected */
|
||||
#define TMPFS_LIMITS_EMPTY_OR_ALMOST ",size=4m,nr_inodes=1k"
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From cac372a80177fb622806270eb0d810e4c6ad0c84 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||
Date: Thu, 9 Dec 2021 10:20:46 +0100
|
||||
Subject: [PATCH 2/2] Bump the max number of inodes for /tmp to a million too
|
||||
|
||||
Fixes #21626. (The bug report talks about /run, but the issue is actually with
|
||||
/tmp.) People use /tmp for various things that fit in memory, e.g. unpacking
|
||||
packages, and 400k is not much. Let's raise is a bit.
|
||||
---
|
||||
units/tmp.mount | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/units/tmp.mount b/units/tmp.mount
|
||||
index 516bd1621c..4e1bb8de24 100644
|
||||
--- a/units/tmp.mount
|
||||
+++ b/units/tmp.mount
|
||||
@@ -22,7 +22,7 @@ After=swap.target
|
||||
What=tmpfs
|
||||
Where=/tmp
|
||||
Type=tmpfs
|
||||
-Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=400k
|
||||
+Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=1m
|
||||
|
||||
# Make 'systemctl enable tmp.mount' work:
|
||||
[Install]
|
||||
--
|
||||
2.27.0
|
||||
|
||||
26
backport-unit-escape.patch
Normal file
26
backport-unit-escape.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 6e4d122ad1db11ca898de183f898f731c4839d4a Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Wed, 23 Feb 2022 01:29:42 +0900
|
||||
Subject: [PATCH] unit: escape %
|
||||
|
||||
Fixes #22601.
|
||||
---
|
||||
units/tmp.mount | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/units/tmp.mount b/units/tmp.mount
|
||||
index 4e1bb8de24..734acea237 100644
|
||||
--- a/units/tmp.mount
|
||||
+++ b/units/tmp.mount
|
||||
@@ -22,7 +22,7 @@ After=swap.target
|
||||
What=tmpfs
|
||||
Where=/tmp
|
||||
Type=tmpfs
|
||||
-Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=1m
|
||||
+Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m
|
||||
|
||||
# Make 'systemctl enable tmp.mount' work:
|
||||
[Install]
|
||||
--
|
||||
2.27.0
|
||||
|
||||
12
systemd.spec
12
systemd.spec
@ -20,7 +20,7 @@
|
||||
Name: systemd
|
||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 249
|
||||
Release: 12
|
||||
Release: 13
|
||||
License: MIT and LGPLv2+ and GPLv2+
|
||||
Summary: System and Service Manager
|
||||
|
||||
@ -79,8 +79,11 @@ Patch6009: backport-CVE-2021-3997-shared-rm-rf-loop-over-nested-directories
|
||||
Patch6010: backport-fix-CVE-2021-33910.patch
|
||||
Patch6011: backport-temporarily-disable-test-seccomp.patch
|
||||
Patch6012: backport-revert-core-map-io.bfq.weight-to-1.1000.patch
|
||||
Patch6013: backport-0001-core-cgroup-fix-error-handling-of-cg_remove_xattr.patch
|
||||
Patch6014: backport-0002-core-wrap-cgroup-path-with-empty_to_root-in-log-mess.patch
|
||||
Patch6013: backport-core-cgroup-fix-error-handling-of-cg_remove_xattr.patch
|
||||
Patch6014: backport-core-wrap-cgroup-path-with-empty_to_root-in-log-mess.patch
|
||||
Patch6015: backport-Bump-the-max-number-of-inodes-for-dev-to-a-million.patch
|
||||
Patch6016: backport-Bump-the-max-number-of-inodes-for-tmp-to-a-million-t.patch
|
||||
Patch6017: backport-unit-escape.patch
|
||||
|
||||
BuildRequires: gcc, gcc-c++
|
||||
BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel
|
||||
@ -1482,6 +1485,9 @@ fi
|
||||
%{_libdir}/security/pam_systemd.so
|
||||
|
||||
%changelog
|
||||
* Thu Mar 17 2022 xujing <xujing99@huawei.com> - 249-13
|
||||
- allow more inodes in /dev an /tmp
|
||||
|
||||
* Fri Mar 11 2022 yangmingtai <yangmingtai@huawei.com> - 249-12
|
||||
- disable some features
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user