Merge pull request #1679 from flatcar/ader1990/upgrade-to-systemd-255-v2

sys-apps/systemd: upgrade from version 252 to version 255

changelog/updates/2024-03-13-systemd-upgrade-from-252-to-255.md

@@ -0,0 +1 @@
+- systemd ([255.3](https://github.com/systemd/systemd-stable/releases/tag/v255.3) (from 252.11))

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages

@@ -1,5 +1,4 @@
 -*sys-apps/busybox
--*sys-apps/kbd
 *app-arch/lbzip2
 *sys-libs/nss-usrfiles
 

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest

@@ -1 +1,6 @@
-DIST systemd-stable-252.11.tar.gz 11845530 BLAKE2B 5c4492040640d09248d4ec775e8bfca5dbe81d42f4fbda6ecb120271624c19d84eeacd0e93dd018fbab714a29954d50898a93238179948927e466b345446bc9a SHA512 f64c452b028eb8c6342a7e3b943fc22adb04bcfe00790dd91827604bf8746b5cf87fbffd666f408b1a89ed999dec2629533b92d02bec560406ea03313fc41206
+DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
+DIST systemd-stable-254.7.tar.gz 14411955 BLAKE2B 1213237a001fb0aef8912637f31d7d77888bc2505e1e8d8d295642a547bdebbc3a786eed095694e6a6fe2665d6e8e45e98cd883186eedeb1b4fd73daf2520dcf SHA512 2e859813f1f52fa693631ce43466875ac2ac42e09872011ee52fe4e44727663c3de9f128a47776899423188c1e99ce73a69059426a9356c930e275037d001685
+DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
+DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
+DIST systemd-stable-255.2.tar.gz 14864388 BLAKE2B 101da82a5d63eaa48c2dc4bad5ab713b4e8b544134de8216f315a97736eb699eaf756aef2d9a4e2126f0d248b3a7e28bc986ccc2154d5d110db733d114072eec SHA512 0a9a43adc6d23f52349d298cdff3f3ae6accd7e43a33253608f7a9d241699c7cba3c9f6a0fa6da3ae3cba0e246e272076bfa2cdf5bade7bc019406f407be0bb9
+DIST systemd-stable-255.3.tar.gz 14873273 BLAKE2B e22ef391c691fcf1e765c5112e1a55096d3bba61a9dae3ea1a3958add4e355892a97d5214e63c516ba3b70e2a83bb5d21254812d870f06c16c74a58d4f957d75 SHA512 c2868a53df2176649b0d0c94e5d451c46ba783bcdbc89ce12434ed2d11dba44b4854ffe4c2430f3f64eef2e214cbb51d5f740170afbd9edd66761a8851157453

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/0004-core-use-max-for-DefaultTasksMax.patch

@@ -1,7 +1,7 @@
-From 7f71d79cc1cac4dc509cecb2f5c00b6dcfd7732b Mon Sep 17 00:00:00 2001
-From: Sayan Chowdhury <sayan@kinvolk.io>
-Date: Thu, 22 Apr 2021 20:08:33 +0530
-Subject: [PATCH 4/7] core: use max for DefaultTasksMax
+From 4cdbcf5df9a2fd165385465bd5be9b8cdb78f83a Mon Sep 17 00:00:00 2001
+From: Adrian Vladu <avladu@cloudbasesolutions.com>
+Date: Fri, 16 Feb 2024 11:22:08 +0000
+Subject: [PATCH] [PATCH 4/7] core: use max for DefaultTasksMax
 
 Since systemd v228, systemd has a DefaultTasksMax which defaulted
 to 512, later 15% of the system's maximum number of PIDs.  This
@@ -13,44 +13,44 @@ accommodate stale values.
 
 This change is built on previous patch by David Michael(dm0-).
 
-Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
+Signed-off-by: Adrian Vladu <avladu@cloudbasesolutions.com>
 ---
  man/systemd-system.conf.xml | 2 +-
- src/core/main.c             | 2 +-
+ src/core/manager.c          | 2 +-
  src/core/system.conf.in     | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index ac21c31d9a..39323f6a55 100644
+index 31b6421399..52819ae8b7 100644
 --- a/man/systemd-system.conf.xml
 +++ b/man/systemd-system.conf.xml
-@@ -461,7 +461,7 @@
+@@ -515,7 +515,7 @@
          <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% of the minimum of <varname>kernel.pid_max=</varname>, <varname>kernel.threads-max=</varname>
 +        of slice units. Defaults to 100% 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.
-         For example with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
-diff --git a/src/core/main.c b/src/core/main.c
-index a3fdd1dfe1..9b79308397 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -100,7 +100,7 @@
- #include <sanitizer/lsan_interface.h>
- #endif
+         For example, with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
+diff --git a/src/core/manager.c b/src/core/manager.c
+index e8c747d96d..df9269aab8 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -114,7 +114,7 @@
+ /* How many units and jobs to process of the bus queue before returning to the event loop. */
+ #define MANAGER_BUS_MESSAGE_BUDGET 100U
 
--#define DEFAULT_TASKS_MAX ((TasksMax) { 15U, 100U }) /* 15% */
-+#define DEFAULT_TASKS_MAX ((TasksMax) { 100U, 100U }) /* 100% */
+-#define DEFAULT_TASKS_MAX ((CGroupTasksMax) { 15U, 100U }) /* 15% */
++#define DEFAULT_TASKS_MAX ((CGroupTasksMax) { 100U, 100U }) /* 15% */
 
- static enum {
-         ACTION_RUN,
+ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
+ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
 diff --git a/src/core/system.conf.in b/src/core/system.conf.in
-index 71a5869ec0..92fe35b2d6 100644
+index 9b89a6aa77..5a7e92ab5a 100644
 --- a/src/core/system.conf.in
 +++ b/src/core/system.conf.in
-@@ -56,7 +56,7 @@
+@@ -59,7 +59,7 @@
  #DefaultIPAccounting=no
  #DefaultMemoryAccounting={{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }}
  #DefaultTasksAccounting=yes
@@ -60,5 +60,5 @@ index 71a5869ec0..92fe35b2d6 100644
  #DefaultLimitFSIZE=
  #DefaultLimitDATA=
 -- 
-2.25.1
+2.34.1
 

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/0007-units-Keep-using-old-journal-file-format.patch

@@ -1,40 +1,42 @@
-From ff9f1aa2ab7d707c57008f406186c45cd9858228 Mon Sep 17 00:00:00 2001
-From: Krzesimir Nowak <knowak@microsoft.com>
-Date: Tue, 7 Feb 2023 11:33:44 +0100
-Subject: [PATCH 7/7] units: Keep using old journal file format
+From 44374d98fb65ff5fdbc2a7d07a076b50b8f2b003 Mon Sep 17 00:00:00 2001
+From: Adrian Vladu <avladu@cloudbasesolutions.com>
+Date: Fri, 16 Feb 2024 11:29:04 +0000
+Subject: [PATCH] [PATCH 7/7] units: Keep using old journal file format
 
 Systemd 252 made an incompatible change in journal file format. Temporarily
 force journald to use the old journal format to give logging containers more
 time to adapt to the new format.
+
+Signed-off-by: Adrian Vladu <avladu@cloudbasesolutions.com>
 ---
  units/systemd-journald.service.in  | 1 +
  units/systemd-journald@.service.in | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index 38ba3e2856..e7f671e070 100644
+index 37eeabc510..e5030a81bd 100644
 --- a/units/systemd-journald.service.in
 +++ b/units/systemd-journald.service.in
-@@ -22,6 +22,7 @@ IgnoreOnIsolate=yes
+@@ -27,6 +27,7 @@ IgnoreOnIsolate=yes
 
  [Service]
  DeviceAllow=char-* rw
 +Environment=SYSTEMD_JOURNAL_COMPACT=0
- ExecStart={{ROOTLIBEXECDIR}}/systemd-journald
+ ExecStart={{LIBEXECDIR}}/systemd-journald
  FileDescriptorStoreMax=4224
  IPAddressDeny=any
 diff --git a/units/systemd-journald@.service.in b/units/systemd-journald@.service.in
-index 35c998285f..9f7c6a2b3f 100644
+index c3bcb08533..8780783cf6 100644
 --- a/units/systemd-journald@.service.in
 +++ b/units/systemd-journald@.service.in
-@@ -16,6 +16,7 @@ After=systemd-journald@%i.socket systemd-journald-varlink@%i.socket
+@@ -21,6 +21,7 @@ Conflicts=soft-reboot.target
  [Service]
  CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
  DevicePolicy=closed
 +Environment=SYSTEMD_JOURNAL_COMPACT=0
- ExecStart={{ROOTLIBEXECDIR}}/systemd-journald %i
+ ExecStart={{LIBEXECDIR}}/systemd-journald %i
  FileDescriptorStoreMax=4224
  Group=systemd-journal
 -- 
-2.25.1
+2.34.1