From: John A. Leuenhagen <john@zlima12.com>
Date: Tue, 15 Oct 2024 04:57:52 +0000 (-0400)
Subject: run: fix bug causing run0 to ignore `-D /`.
X-Git-Tag: v257-rc1~219^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0054a2acc3894e45171806bd64887211820b8eaf;p=thirdparty%2Fsystemd.git

run: fix bug causing run0 to ignore `-D /`.

Since the root directory was being suppressed to NULL, the subsequent
check would erroneously think that no working directory was specified.
This caused the default working directory to be applied instead.
---

diff --git a/src/run/run.c b/src/run/run.c
index 1f2938f9eae..5d2298a5f6c 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -862,7 +862,8 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
                         break;
 
                 case 'D':
-                        r = parse_path_argument(optarg, true, &arg_working_directory);
+                        /* Root will be manually suppressed later. */
+                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_working_directory);
                         if (r < 0)
                                 return r;
 
@@ -901,6 +902,10 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
                         if (r < 0)
                                 return log_error_errno(r, "Failed to get current working directory: %m");
                 }
+        } else {
+                /* Root was not suppressed earlier, to allow the above check to work properly. */
+                if (empty_or_root(arg_working_directory))
+                        arg_working_directory = mfree(arg_working_directory);
         }
 
         arg_service_type = "exec";