|
 |
8c1b90 |
From 6b25470ee28843a49c50442e9d8a98edc842ceca Mon Sep 17 00:00:00 2001
|
|
|
8c1b90 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
8c1b90 |
Date: Mon, 20 Feb 2023 12:00:30 +0900
|
|
|
8c1b90 |
Subject: [PATCH] core/manager: run generators directly when we are in initrd
|
|
|
8c1b90 |
|
|
|
8c1b90 |
Some initrd system write files at ourside of /run, /etc, or other
|
|
|
8c1b90 |
allowed places. This is a kind of workaround, but in most cases, such
|
|
|
8c1b90 |
sandboxing is not necessary as the filesystem is on ramfs when we are in
|
|
|
8c1b90 |
initrd.
|
|
|
8c1b90 |
|
|
|
8c1b90 |
Fixes #26488.
|
|
|
8c1b90 |
---
|
|
|
8c1b90 |
src/core/manager.c | 4 ++--
|
|
|
8c1b90 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
8c1b90 |
|
|
|
8c1b90 |
diff --git a/src/core/manager.c b/src/core/manager.c
|
|
 |
1641c4 |
index 7b394794b0d4d..306477c6e6c2d 100644
|
|
|
8c1b90 |
--- a/src/core/manager.c
|
|
|
8c1b90 |
+++ b/src/core/manager.c
|
|
|
8c1b90 |
@@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) {
|
|
|
8c1b90 |
/* If we are the system manager, we fork and invoke the generators in a sanitized mount namespace. If
|
|
|
8c1b90 |
* we are the user manager, let's just execute the generators directly. We might not have the
|
|
|
8c1b90 |
* necessary privileges, and the system manager has already mounted /tmp/ and everything else for us.
|
|
|
8c1b90 |
- */
|
|
|
8c1b90 |
- if (MANAGER_IS_USER(m)) {
|
|
|
8c1b90 |
+ * If we are in initrd, let's also execute the generators directly, as we are in ramfs. */
|
|
|
8c1b90 |
+ if (MANAGER_IS_USER(m) || in_initrd()) {
|
|
|
8c1b90 |
r = manager_execute_generators(m, paths, /* remount_ro= */ false);
|
|
|
8c1b90 |
goto finish;
|
|
|
8c1b90 |
}
|