mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-18 21:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #869 from kinvolk/sayan/update-systemd-247.3

Browse Source 
sys-apps/systemd: Bump to v247.3
This commit is contained in:
Sayan Chowdhury 2021-03-02 17:29:28 +05:30 committed by GitHub
commit 2477513a35
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest vendored
View File

@ -1 +1 @@
DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82 DIST systemd-stable-247.3.tar.gz 9895385 BLAKE2B f5b8b4beb5586563fac4a339a5fb6dfd2f95ec52c2a2214ca8229500b1c78653ba3f1f9713a67fbbeb78426da3b71e3f9532c4017ee44f46b47893d31d4b0457 SHA512 0b12f6b9b02d86ee2f4198dd5f96a6267652fdc4867517e10a214a59b63c996fd14aeb2f47a97806718cdda52d1705a3b2359e4ae5e5d8d52d61ad05e7941d1e

17
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/0007-core-use-max-for-DefaultTasksMax.patch vendored
View File

@ -8,26 +8,27 @@ to 512, later 15% of the system's maximum number of PIDs. This
limit is low and a change in behavior that people running services limit is low and a change in behavior that people running services
in containers will hit frequently, so revert to previous behavior. in containers will hit frequently, so revert to previous behavior.
--- ---
man/systemd-system.conf.xml | 5 +---- man/systemd-system.conf.xml | 6 +-----
src/basic/cgroup-util.h | 4 ++++ src/basic/cgroup-util.h | 4 ++++
src/core/system.conf.in | 2 +- src/core/system.conf.in | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-) 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 0dea50f2fe..bcbed4cf59 100644 index 075666ac6b..bcbed4cf59 100644
--- a/man/systemd-system.conf.xml --- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml
@@ -361,10 +361,7 @@ @@ -361,11 +361,7 @@
<listitem><para>Configure the default value for the per-unit <varname>TasksMax=</varname> setting. See <listitem><para>Configure the default value for the per-unit <varname>TasksMax=</varname> setting. See
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details. This setting applies to all unit types that support resource control settings, with the exception for details. This setting applies to all unit types that support resource control settings, with the exception
- of slice units. Defaults to 15% of the sysctl setting <varname>kernel.pid_max=</varname> or root cgroup <varname>pids.max</varname>. - of slice units. Defaults to 15% of the minimum of <varname>kernel.pid_max=</varname>, <varname>kernel.threads-max=</varname>
- and root cgroup <varname>pids.max</varname>.
- Kernel has a default value for <varname>kernel.pid_max=</varname> and an algorithm of counting in case of more than 32 cores. - Kernel has a default value for <varname>kernel.pid_max=</varname> and an algorithm of counting in case of more than 32 cores.
- For example with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915, - For example with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
- but might be greater in other systems or smaller in OS containers.</para></listitem> - but might be greater in other systems or smaller in OS containers.</para></listitem>
+ of slice units. Defaults to 100%.</para></listitem> + of slice units. Defaults to 100%.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index bdc0d0d086..345a99aa5c 100644 index bdc0d0d086..345a99aa5c 100644
@ -36,7 +37,7 @@ index bdc0d0d086..345a99aa5c 100644
@@ -129,6 +129,10 @@ static inline bool CGROUP_BLKIO_WEIGHT_IS_OK(uint64_t x) { @@ -129,6 +129,10 @@ static inline bool CGROUP_BLKIO_WEIGHT_IS_OK(uint64_t x) {
(x >= CGROUP_BLKIO_WEIGHT_MIN && x <= CGROUP_BLKIO_WEIGHT_MAX); (x >= CGROUP_BLKIO_WEIGHT_MIN && x <= CGROUP_BLKIO_WEIGHT_MAX);
} }
+/* Default resource limits */ +/* Default resource limits */
+#define DEFAULT_TASKS_MAX_PERCENTAGE 100U /* 100% of PIDs */ +#define DEFAULT_TASKS_MAX_PERCENTAGE 100U /* 100% of PIDs */
+#define DEFAULT_USER_TASKS_MAX_PERCENTAGE 33U /* 33% of PIDs, 10813 on default settings */ +#define DEFAULT_USER_TASKS_MAX_PERCENTAGE 33U /* 33% of PIDs, 10813 on default settings */
@ -57,6 +58,6 @@ index 40bb548887..c6cddf4f79 100644
#DefaultLimitCPU= #DefaultLimitCPU=
#DefaultLimitFSIZE= #DefaultLimitFSIZE=
#DefaultLimitDATA= #DefaultLimitDATA=
-- --
2.26.2 2.26.2

0
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-247.2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-247.3.ebuild vendored
View File