From 675a4841cc9a6d6ebed7e616647566fae4b41a54 Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 5 Nov 2025 17:27:56 +0100
Subject: [PATCH] core/service: do not pass $MANAGERPID and friends if pidns is
 employed

---
 src/core/service.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/service.c b/src/core/service.c
index 5c1e6189f5..7b44635194 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1810,7 +1810,9 @@ static int service_spawn_internal(
                                 return -ENOMEM;
         }
 
-        if (MANAGER_IS_USER(UNIT(s)->manager)) {
+        if (MANAGER_IS_USER(UNIT(s)->manager) &&
+            !exec_needs_pid_namespace(&s->exec_context, /* params = */ NULL)) {
+
                 if (asprintf(our_env + n_env++, "MANAGERPID="PID_FMT, getpid_cached()) < 0)
                         return -ENOMEM;