core/service: do not pass $MANAGERPID and friends if pidns is employed

diff --git a/src/core/service.c b/src/core/service.c
index 5c1e6189f588248654626192cd47094b6c1e84b7..7b446351943cc2b3f4943117f200ecda7fcdebc5 100644 (file)
--- 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;