Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1015 from kinvolk/dongsu/systemd-246.13
Browse files Browse the repository at this point in the history
sys-apps/systemd: update systemd to 246.13
  • Loading branch information
Dongsu Park authored May 17, 2021
2 parents 2dd80e8 + e421b37 commit ed3f06c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion sys-apps/systemd/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
DIST systemd-stable-246.13.tar.gz 9565553 BLAKE2B d4335af50769619567033e5f567b186b4390978c95f86a2426d8dcafc90b67763bf67b6af89d4d21a8f61fbc81978c86ac34d86c17f5238f3d354872c0e379ff SHA512 b8bf10d6201b3505f20f9b113d7dccae457163317349f2fe8c062bf44c5ebcb6c93f0f87110a4cbefa74ee7ea2b1b0476c362acba4739027397957ca1ccfb528
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ index c64e57c277..c6824f976f 100644
<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>
for details. This setting applies to all unit types that support resource control settings, with the exception
- of slice units. Defaults to 15%, which equals 4915 with the kernel's defaults on the host, but might be smaller
+ of slice units. Defaults to 100%, which equals 4915 with the kernel's defaults on the host, but might be smaller
in OS containers.</para></listitem>
</varlistentry>

- 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 100% of the sysctl setting <varname>kernel.pid_max=</varname> or 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.
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>
diff --git a/src/core/main.c b/src/core/main.c
index 9a834a875e..851c0a929d 100644
--- a/src/core/main.c
Expand Down

0 comments on commit ed3f06c

Please sign in to comment.