summaryrefslogtreecommitdiff
path: root/sys-apps/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r--sys-apps/systemd/Manifest3
-rw-r--r--sys-apps/systemd/files/systemd-253-initrd-generators.patch34
-rw-r--r--sys-apps/systemd/systemd-253-r1.ebuild (renamed from sys-apps/systemd/systemd-253.ebuild)1
3 files changed, 37 insertions, 1 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3fd63bd7d827..71e1bcb121df 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -5,6 +5,7 @@ AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3
AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
+AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b
AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
DIST systemd-253.tar.gz 11987237 BLAKE2B 58a7ecc73149ea53a5af0b7968b1da51e4d8aa3316867266a697e91410bb68371456007b0813353276113ec6ea45a0c44cf5baa1d5082628ff658087b05863e2 SHA512 3bbc431a292ab590b70d3b490a528f71d30ccf478ddfa66d1c210f40c260ef49ac30651c19f2d073acf38d68398a4a6fbf95391f0e3ea0333d94b9d4e81d514f
DIST systemd-stable-252.4.tar.gz 11753300 BLAKE2B 8819ca6d3a64c110e5a245ae0369dc431079556e200d13d8edfc64fc35b2b04f1cdc215b81d9bf126245f315be3662ebd2c094167f88d2465f0dce25aa1fd196 SHA512 d4e99a67c59091dae78f654433a6c5e114ae66256b72d9d43292c43a986ee6a58e2d06f12866cbd7ec821b61580ec003af1725f60fd4b038b4a981b3ca839ee2
@@ -13,6 +14,6 @@ DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84b
EBUILD systemd-252.4-r1.ebuild 15573 BLAKE2B 92ceafc762c464491a1749f702667b898d8228d560ace390cdedd13715acf343ea4f782bf5ec0e6bb58601ac156d2a5bfe5d9d5d19bd991839c8d3c283846940 SHA512 497a035c612c242d99b347fcfdaaef4b91477071ac9c14a06139b8641318aad7966911972bbbcaba530de790f3aa62f532ac3285c9a7cc331988440900941ddc
EBUILD systemd-252.5.ebuild 14594 BLAKE2B ec075f5a7be26f1abe85d62527664dd913538b43f04d1683fcf8c54b0b7286909e64a6fee78dffdbdd46a2b6c62df9eea938f47fa2485ed8bd93add14a9782ea SHA512 b398f07688e5805690db7a7fa8545190dedd2ee02bd77930849ff9342a5c4a324a81266d6e807a8819f100122c8a8264df10910bd7c22511dd9897eea98c3c20
EBUILD systemd-252.6.ebuild 14594 BLAKE2B ec075f5a7be26f1abe85d62527664dd913538b43f04d1683fcf8c54b0b7286909e64a6fee78dffdbdd46a2b6c62df9eea938f47fa2485ed8bd93add14a9782ea SHA512 b398f07688e5805690db7a7fa8545190dedd2ee02bd77930849ff9342a5c4a324a81266d6e807a8819f100122c8a8264df10910bd7c22511dd9897eea98c3c20
-EBUILD systemd-253.ebuild 14429 BLAKE2B cf3df2f56d46e3cddf6c588c193ba2adac1de1e70a952bc6e92982a326dd8ca38b34463ceb072db5e7d62dddd1d8b2e1177e56a3597ae8c83e5fd9b3fe256401 SHA512 4abc456a5ddd9360a8b35d83d346c699e20dbbc08839abaf28c1db586a66de3f765c341f9b811aa8ce57b84390ddb4d12ea323035f4d8ace5b19ea626eba20e9
+EBUILD systemd-253-r1.ebuild 14481 BLAKE2B 7a78dcdde3d776e7ec929eef77f5d696c2f4bef4b5d4161f7c26a63788e4b86920caef3f1e1901ef95b777f18d6163a365e0d662d21ca4f94c2f06c72c1a2dbb SHA512 7619dca134f128dee350b61df270c810d4a61a893af0a4d998bfa7a64013243e1fcefb286f3cd295add7b79c0a6dee2b19a8f617fee424dc170d11b4e6d65875
EBUILD systemd-9999.ebuild 14429 BLAKE2B cf3df2f56d46e3cddf6c588c193ba2adac1de1e70a952bc6e92982a326dd8ca38b34463ceb072db5e7d62dddd1d8b2e1177e56a3597ae8c83e5fd9b3fe256401 SHA512 4abc456a5ddd9360a8b35d83d346c699e20dbbc08839abaf28c1db586a66de3f765c341f9b811aa8ce57b84390ddb4d12ea323035f4d8ace5b19ea626eba20e9
MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/files/systemd-253-initrd-generators.patch b/sys-apps/systemd/files/systemd-253-initrd-generators.patch
new file mode 100644
index 000000000000..60e7b29d7a1f
--- /dev/null
+++ b/sys-apps/systemd/files/systemd-253-initrd-generators.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/896364
+
+Workaround for bug in sys-kernel/dracut.
+
+From 6b25470ee28843a49c50442e9d8a98edc842ceca Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 20 Feb 2023 12:00:30 +0900
+Subject: [PATCH] core/manager: run generators directly when we are in initrd
+
+Some initrd system write files at ourside of /run, /etc, or other
+allowed places. This is a kind of workaround, but in most cases, such
+sandboxing is not necessary as the filesystem is on ramfs when we are in
+initrd.
+
+Fixes #26488.
+---
+ src/core/manager.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index 7b394794b0d4..306477c6e6c2 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) {
+ /* If we are the system manager, we fork and invoke the generators in a sanitized mount namespace. If
+ * we are the user manager, let's just execute the generators directly. We might not have the
+ * necessary privileges, and the system manager has already mounted /tmp/ and everything else for us.
+- */
+- if (MANAGER_IS_USER(m)) {
++ * If we are in initrd, let's also execute the generators directly, as we are in ramfs. */
++ if (MANAGER_IS_USER(m) || in_initrd()) {
+ r = manager_execute_generators(m, paths, /* remount_ro= */ false);
+ goto finish;
+ }
diff --git a/sys-apps/systemd/systemd-253.ebuild b/sys-apps/systemd/systemd-253-r1.ebuild
index 77c9145b2914..cb638034f21f 100644
--- a/sys-apps/systemd/systemd-253.ebuild
+++ b/sys-apps/systemd/systemd-253-r1.ebuild
@@ -231,6 +231,7 @@ src_unpack() {
src_prepare() {
local PATCHES=(
+ "${FILESDIR}/systemd-253-initrd-generators.patch"
)
if ! use vanilla; then