diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-01 11:42:50 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-01 11:42:50 +0100 |
commit | b447ac3a6d1bb09ddb6a5686620670e223b37642 (patch) | |
tree | 4d6d1ca6d418b0dc7c50e0e94cef5038f5fb2483 /sys-apps/systemd | |
parent | 9a92076d428b51966bd8d699427341e5500b3a8a (diff) |
gentoo auto-resync : 01:10:2023 - 11:42:49
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r-- | sys-apps/systemd/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/systemd/files/systemd-253.5-services-stop.patch | 36 | ||||
-rw-r--r-- | sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch | 252 |
3 files changed, 0 insertions, 290 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index f904ad8e976f..78ca59083458 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -3,8 +3,6 @@ AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3 AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b -AUX systemd-253.5-services-stop.patch 1429 BLAKE2B 3e191d2f98173c4b75791b8ade557f250229021d50c84efb9010ed06bb9a4df6e0b084625d9c3c8dbb16b8378a7c62ddbb3be4cf17790169709c581c09802fea SHA512 74e3cab089d1d3ca1603b3180638dfe2a6a0dfc494b9b72920f1b0cbe659784582d9757ba1b3f75b0c6469ae88a782a26da89049b5571b0f1ec50e845092ab21 -AUX systemd-254.1-tmpfiles-setup-dev-early.patch 9923 BLAKE2B 943f1eab877623ac6ad1b1ce51adbff4c4f8c9857dcb869711b10421c2173b7d25b838e82773de9404fe1b77dbe9593085dd104730f48619bf1799b056c9f4c4 SHA512 8984bc8fcbc495082b60ccd33a74269832c6cbe6d8907df8193a26a89867e5358cdeecfb9c7d093b35c11b3351f9b55778425ddb4de7d806209a63d71b368139 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781 DIST systemd-stable-253.11.tar.gz 12116691 BLAKE2B bb8d95e77ad970ba642346fd0179384258b13b94aacb9f6ff05d4967f5e13d1c709f8b917e485a227fb126e552429c4e302b959eb4697a69dc88b45836c36646 SHA512 0018a544f924725f1e7664bfbee0c66591514c077e97352ae5d8d90b6dccfd4d07b9876f25923afa9782b57cc17b8e9ab34c7ae627998804751ba38e46558af4 DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15858ec03e44ca55466b4f07af659582abb9648c081d1756439c5d5cc6eb55783be987c1b801fea64e66c0abe8ef1df140f9b SHA512 dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2 diff --git a/sys-apps/systemd/files/systemd-253.5-services-stop.patch b/sys-apps/systemd/files/systemd-253.5-services-stop.patch deleted file mode 100644 index 5f2c5aa8890d..000000000000 --- a/sys-apps/systemd/files/systemd-253.5-services-stop.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/systemd/systemd-stable/issues/302 -https://github.com/systemd/systemd/pull/28000 - -From 5f7f82ba625ee48d662c1f0286f44b8b0918d05d Mon Sep 17 00:00:00 2001 -From: msizanoen <msizanoen@qtmlabs.xyz> -Date: Mon, 12 Jun 2023 10:30:12 +0700 -Subject: [PATCH] Revert "core/service: when resetting PID also reset known - flag" - -This reverts commit ff32060f2ed37b68dc26256b05e2e69013b0ecfe. - -This change is incorrect as we don't want to mark the PID as invalid but -only mark it as dead. - -The change in question also breaks user level socket activation for -`podman.service` as the termination of the main `podman system service` -process is not properly handled, causing any application accessing the -socket to hang. - -This is because the user-level `podman.service` unit also hosts two -non-main processes: `rootlessport` and `rootlessport-child` which causes -the `cgroup_good` check to still succeed. - -The original submitter of this commit is recommended to find another -more correct way to fix the cgroupsv1 issue on CentOS 8. ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -3752,7 +3752,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { - return; - - s->main_pid = 0; -- s->main_pid_known = false; - exec_status_exit(&s->main_exec_status, &s->exec_context, pid, code, status); - - if (s->main_command) { - diff --git a/sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch b/sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch deleted file mode 100644 index 77f6e19fe6c8..000000000000 --- a/sys-apps/systemd/files/systemd-254.1-tmpfiles-setup-dev-early.patch +++ /dev/null @@ -1,252 +0,0 @@ -https://github.com/systemd/systemd/pull/28784 -https://bugs.gentoo.org/911723 - -From bb7f485f4bddd57bbf50739bafa43d127bab59d6 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Sat, 12 Aug 2023 07:54:32 +0900 -Subject: [PATCH] units: introduce systemd-tmpfiles-setup-dev-early.service - -This makes tmpfiles, sysusers, and udevd invoked in the following order: -1. systemd-tmpfiles-setup-dev-early.service - Create device nodes gracefully, that is, create device nodes anyway - by ignoring unknown users and groups. -2. systemd-sysusers.service - Create users and groups, to make later invocations of tmpfiles and - udevd can resolve necessary users and groups. -3. systemd-tmpfiles-setup-dev.service - Adjust owners of previously created device nodes. -4. systemd-udevd.service - Process all devices. Especially to make block devices active and can - be mountable. -5. systemd-tmpfiles-setup.service - Setup basic filesystem. - -Follow-up for b42482af904ae0b94a6e4501ec595448f0ba1c06. - -Fixes #28653. -Replaces #28681 and #28732. ---- - man/systemd-tmpfiles.xml | 3 + - test/TEST-17-UDEV/test.sh | 4 ++ - test/units/testsuite-17.00.sh | 57 +++++++++++++++++++ - units/kmod-static-nodes.service.in | 2 +- - units/meson.build | 5 ++ - units/systemd-sysusers.service | 2 + - .../systemd-tmpfiles-setup-dev-early.service | 25 ++++++++ - units/systemd-tmpfiles-setup-dev.service | 3 +- - units/systemd-tmpfiles-setup.service | 2 +- - 9 files changed, 100 insertions(+), 3 deletions(-) - create mode 100755 test/units/testsuite-17.00.sh - create mode 100644 units/systemd-tmpfiles-setup-dev-early.service - -diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml -index decd66d5c667..0db2a4b03b46 100644 ---- a/man/systemd-tmpfiles.xml -+++ b/man/systemd-tmpfiles.xml -@@ -19,6 +19,7 @@ - <refnamediv> - <refname>systemd-tmpfiles</refname> - <refname>systemd-tmpfiles-setup.service</refname> -+ <refname>systemd-tmpfiles-setup-dev-early.service</refname> - <refname>systemd-tmpfiles-setup-dev.service</refname> - <refname>systemd-tmpfiles-clean.service</refname> - <refname>systemd-tmpfiles-clean.timer</refname> -@@ -35,6 +36,7 @@ - - <para>System units: - <literallayout><filename>systemd-tmpfiles-setup.service</filename> -+<filename>systemd-tmpfiles-setup-dev-early.service</filename> - <filename>systemd-tmpfiles-setup-dev.service</filename> - <filename>systemd-tmpfiles-clean.service</filename> - <filename>systemd-tmpfiles-clean.timer</filename></literallayout></para> -@@ -64,6 +66,7 @@ - searched for a matching file and the file found that has the highest priority is executed.</para> - - <para>System services (<filename>systemd-tmpfiles-setup.service</filename>, -+ <filename>systemd-tmpfiles-setup-dev-early.service</filename>, - <filename>systemd-tmpfiles-setup-dev.service</filename>, - <filename>systemd-tmpfiles-clean.service</filename>) invoke <command>systemd-tmpfiles</command> to create - system files and to perform system wide cleanup. Those services read administrator-controlled -diff --git a/test/TEST-17-UDEV/test.sh b/test/TEST-17-UDEV/test.sh -index 6b8f08fc328a..f7a907549607 100755 ---- a/test/TEST-17-UDEV/test.sh -+++ b/test/TEST-17-UDEV/test.sh -@@ -8,5 +8,9 @@ TEST_NO_NSPAWN=1 - # shellcheck source=test/test-functions - . "${TEST_BASE_DIR:?}/test-functions" - -+test_append_files() { -+ instmods snd_seq snd_timer tun -+ generate_module_dependencies -+} - - do_test "$@" -diff --git a/test/units/testsuite-17.00.sh b/test/units/testsuite-17.00.sh -new file mode 100755 -index 000000000000..d2aec60b1326 ---- /dev/null -+++ b/test/units/testsuite-17.00.sh -@@ -0,0 +1,57 @@ -+#!/usr/bin/env bash -+# SPDX-License-Identifier: LGPL-2.1-or-later -+set -ex -+set -o pipefail -+ -+# shellcheck source=test/units/util.sh -+. "$(dirname "$0")"/util.sh -+ -+# Tests for issue #28588 and #28653. -+ -+# On boot, services need to be started in the following order: -+# 1. systemd-tmpfiles-setup-dev-early.service -+# 2. systemd-sysusers.service -+# 3. systemd-tmpfiles-setup-dev.service -+# 4. systemd-udevd.service -+ -+output="$(systemctl show --property After --value systemd-udevd.service)" -+assert_in "systemd-tmpfiles-setup-dev-early.service" "$output" -+assert_in "systemd-sysusers.service" "$output" -+assert_in "systemd-tmpfiles-setup-dev.service" "$output" -+ -+output="$(systemctl show --property After --value systemd-tmpfiles-setup-dev.service)" -+assert_in "systemd-tmpfiles-setup-dev-early.service" "$output" -+assert_in "systemd-sysusers.service" "$output" -+ -+output="$(systemctl show --property After --value systemd-sysusers.service)" -+assert_in "systemd-tmpfiles-setup-dev-early.service" "$output" -+ -+check_owner_and_mode() { -+ local dev=${1?} -+ local user=${2?} -+ local group=${3?} -+ local mode=${4:-} -+ -+ if [[ -e "$dev" ]]; then -+ assert_in "$user" "$(stat --format=%U "$dev")" -+ assert_in "$group" "$(stat --format=%G "$dev")" -+ if [[ -n "$mode" ]]; then -+ assert_in "$mode" "$(stat --format=%#0a "$dev")" -+ fi -+ fi -+ -+ return 0 -+} -+ -+# Check owner and access mode specified in static-nodes-permissions.conf -+check_owner_and_mode /dev/snd/seq root audio 0660 -+check_owner_and_mode /dev/snd/timer root audio 0660 -+check_owner_and_mode /dev/loop-control root disk 0660 -+check_owner_and_mode /dev/net/tun root root 0666 -+check_owner_and_mode /dev/fuse root root 0666 -+check_owner_and_mode /dev/vfio/vfio root root 0666 -+check_owner_and_mode /dev/kvm root kvm -+check_owner_and_mode /dev/vhost-net root kvm -+check_owner_and_mode /dev/vhost-vsock root kvm -+ -+exit 0 -diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 777e82d16b90..70605d997e0a 100644 ---- a/units/kmod-static-nodes.service.in -+++ b/units/kmod-static-nodes.service.in -@@ -10,7 +10,7 @@ - [Unit] - Description=Create List of Static Device Nodes - DefaultDependencies=no --Before=sysinit.target systemd-tmpfiles-setup-dev.service -+Before=sysinit.target systemd-tmpfiles-setup-dev-early.service - ConditionCapability=CAP_SYS_MODULE - ConditionFileNotEmpty=/lib/modules/%v/modules.devname - -diff --git a/units/meson.build b/units/meson.build -index 96ad1dc85016..20665e040874 100644 ---- a/units/meson.build -+++ b/units/meson.build -@@ -544,6 +544,11 @@ units = [ - 'conditions' : ['ENABLE_TMPFILES'], - 'symlinks' : ['timers.target.wants/'], - }, -+ { -+ 'file' : 'systemd-tmpfiles-setup-dev-early.service', -+ 'conditions' : ['ENABLE_TMPFILES'], -+ 'symlinks' : ['sysinit.target.wants/'], -+ }, - { - 'file' : 'systemd-tmpfiles-setup-dev.service', - 'conditions' : ['ENABLE_TMPFILES'], -diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service -index 84fd66de37aa..de6c71a03825 100644 ---- a/units/systemd-sysusers.service -+++ b/units/systemd-sysusers.service -@@ -16,6 +16,8 @@ ConditionCredential=|sysusers.extra - - DefaultDependencies=no - After=systemd-remount-fs.service -+After=systemd-tmpfiles-setup-dev-early.service -+Before=systemd-tmpfiles-setup-dev.service - Before=sysinit.target systemd-update-done.service - Conflicts=shutdown.target initrd-switch-root.target - Before=shutdown.target initrd-switch-root.target -diff --git a/units/systemd-tmpfiles-setup-dev-early.service b/units/systemd-tmpfiles-setup-dev-early.service -new file mode 100644 -index 000000000000..0d6f0daaae32 ---- /dev/null -+++ b/units/systemd-tmpfiles-setup-dev-early.service -@@ -0,0 +1,25 @@ -+# SPDX-License-Identifier: LGPL-2.1-or-later -+# -+# This file is part of systemd. -+# -+# systemd is free software; you can redistribute it and/or modify it -+# under the terms of the GNU Lesser General Public License as published by -+# the Free Software Foundation; either version 2.1 of the License, or -+# (at your option) any later version. -+ -+[Unit] -+Description=Create Static Device Nodes in /dev gracefully -+Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) -+ -+DefaultDependencies=no -+Before=sysinit.target local-fs-pre.target systemd-udevd.service -+Wants=local-fs-pre.target -+Conflicts=shutdown.target initrd-switch-root.target -+Before=shutdown.target initrd-switch-root.target -+ -+[Service] -+Type=oneshot -+RemainAfterExit=yes -+ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful -+SuccessExitStatus=DATAERR CANTCREAT -+ImportCredential=tmpfiles.* -diff --git a/units/systemd-tmpfiles-setup-dev.service b/units/systemd-tmpfiles-setup-dev.service -index acaa9510aa60..3016b497493f 100644 ---- a/units/systemd-tmpfiles-setup-dev.service -+++ b/units/systemd-tmpfiles-setup-dev.service -@@ -12,6 +12,7 @@ Description=Create Static Device Nodes in /dev - Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) - - DefaultDependencies=no -+After=systemd-tmpfiles-setup-dev-early.service - Before=sysinit.target local-fs-pre.target systemd-udevd.service - Wants=local-fs-pre.target - Conflicts=shutdown.target initrd-switch-root.target -@@ -20,6 +21,6 @@ Before=shutdown.target initrd-switch-root.target - [Service] - Type=oneshot - RemainAfterExit=yes --ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful -+ExecStart=systemd-tmpfiles --prefix=/dev --create --boot - SuccessExitStatus=DATAERR CANTCREAT - ImportCredential=tmpfiles.* -diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service -index 6c5e3de8fd96..6cae32850f4f 100644 ---- a/units/systemd-tmpfiles-setup.service -+++ b/units/systemd-tmpfiles-setup.service -@@ -21,7 +21,7 @@ RefuseManualStop=yes - [Service] - Type=oneshot - RemainAfterExit=yes --ExecStart=systemd-tmpfiles --create --remove --boot -+ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev - SuccessExitStatus=DATAERR CANTCREAT - ImportCredential=tmpfiles.* - ImportCredential=login.motd |