ryantimwilson / rpms / systemd

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