Skip to content

Commit 97ad543

Browse files
committed
sys-apps/systemd: revert systemd patch 1c585a4ccda3258088d7bc27b27a314e7ed8be80
1 parent 4b4182d commit 97ad543

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 65e3f4e837001f6f00359a779b6c5801566aa750 Mon Sep 17 00:00:00 2001
2+
From: Adrian Vladu <avladu@cloudbasesolutions.com>
3+
Date: Wed, 25 Sep 2024 15:51:02 +0000
4+
Subject: [PATCH] Revert "Revert "initrd-parse-etc: override argv[0] to avoid
5+
dracut issue""
6+
7+
This reverts commit 1c585a4ccda3258088d7bc27b27a314e7ed8be80.
8+
---
9+
units/initrd-parse-etc.service.in | 4 +++-
10+
1 file changed, 3 insertions(+), 1 deletion(-)
11+
12+
diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service.in
13+
index 1eef2bd9be..3dadab1123 100644
14+
--- a/units/initrd-parse-etc.service.in
15+
+++ b/units/initrd-parse-etc.service.in
16+
@@ -23,7 +23,9 @@ OnFailureJobMode=replace-irreversibly
17+
[Service]
18+
Type=oneshot
19+
20+
-ExecStart={{LIBEXECDIR}}/systemd-sysroot-fstab-check
21+
+# FIXME: once dracut is patched to install the symlink, change to:
22+
+# ExecStart={{LIBEXECDIR}}/systemd-sysroot-fstab-check
23+
+ExecStart=@{{SYSTEM_GENERATOR_DIR}}/systemd-fstab-generator systemd-sysroot-fstab-check
24+
25+
# We want to enqueue initrd-cleanup.service/start after we finished the part
26+
# above. It can't be part of the initial transaction, because non-oneshot units
27+
--
28+
2.34.1
29+

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-256.9.ebuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ src_prepare() {
265265
"${FILESDIR}/0005-systemd-Disable-SELinux-permissions-checks.patch"
266266
"${FILESDIR}/0006-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch"
267267
"${FILESDIR}/0007-units-Keep-using-old-journal-file-format.patch"
268+
"${FILESDIR}/0009-initrd-parse-etc.service.patch"
268269
)
269270

270271
if ! use vanilla; then

0 commit comments

Comments
 (0)