Add workaround patch for dracut generator issue
... (rhbz#2164404)
This commit is contained in:
parent
296e35b054
commit
4bdd16eba5
|
@ -0,0 +1,30 @@
|
||||||
|
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;
|
||||||
|
}
|
|
@ -90,6 +90,9 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
|
||||||
# than in the next section. Packit CI will drop any patches in this range before
|
# than in the next section. Packit CI will drop any patches in this range before
|
||||||
# applying upstream pull requests.
|
# applying upstream pull requests.
|
||||||
|
|
||||||
|
# https://github.com/systemd/systemd/issues/26488
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2164404
|
||||||
|
Patch0001: https://patch-diff.githubusercontent.com/raw/systemd/systemd/pull/26494.patch
|
||||||
|
|
||||||
# Those are downstream-only patches, but we don't want them in packit builds:
|
# Those are downstream-only patches, but we don't want them in packit builds:
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1738828
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1738828
|
||||||
|
|
Loading…
Reference in New Issue