From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Feb 2017 12:16:51 +0000 (+0100)
Subject: execute: use prefix_roota() where appropriate
X-Git-Tag: v233~129^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b0e5bb524e3274e61aced08f72907d96eaeedaa;p=thirdparty%2Fsystemd.git

execute: use prefix_roota() where appropriate
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 492df2fedba..be036957762 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2040,7 +2040,7 @@ static int apply_working_directory(
 
                 d = wd;
         } else
-                d = strjoina(strempty(context->root_directory), "/", strempty(wd));
+                d = prefix_roota(context->root_directory, wd);
 
         if (chdir(d) < 0 && !context->working_directory_missing_ok)
                 return -errno;