exec: also evaluate working_directory_missing_ok when not applying chroots

diff --git a/src/core/execute.c b/src/core/execute.c
index 1f6072c6aba368f886ec24b604e90c5f3de6e4d5..340b8000d4f224667a96863f5f9bfc2891955e0b 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1626,13 +1626,14 @@ static int exec_child(
                 _cleanup_free_ char *d = NULL;
 
                 if (asprintf(&d, "%s/%s",
-                             context->root_directory ? context->root_directory : "",
-                             context->working_directory ? context->working_directory : "") < 0) {
+                             context->root_directory ?: "",
+                             context->working_directory ?: "") < 0) {
                         *exit_status = EXIT_MEMORY;
                         return -ENOMEM;
                 }
 
-                if (chdir(d) < 0) {
+                if (chdir(d) < 0 &&
+                    !context->working_directory_missing_ok) {
                         *exit_status = EXIT_CHDIR;
                         return -errno;
                 }