From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Jul 2022 19:18:41 +0000 (+0900)
Subject: core: do not filter out systemd.unit= and run-level specifier from kernel command... 
X-Git-Tag: v252-rc1~745^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bffde9b5869fffc09e7824d2ac0aeb82a31a134b;p=thirdparty%2Fsystemd.git

core: do not filter out systemd.unit= and run-level specifier from kernel command line

Fixes a bug introduced by 846f1da465beda990c1c01346311393f485df467.

The commit 846f1da465beda990c1c01346311393f485df467 made systemd.unit=
filtered out from the command line. That causes debug-generator does not
work as expected on daemon-reexecute, and we cannot call `systemctl
daemon-reexecute` in our test suite running on nspawn.

Fixes issue reported in https://github.com/systemd/systemd/pull/23851#issuecomment-1170992052.
---

diff --git a/src/core/main.c b/src/core/main.c
index 7cd13b9e13e..94c757e21e0 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1721,13 +1721,6 @@ static void filter_args(
                         continue;
                 }
 
-                if (startswith(src[i],
-                               in_initrd() ? "rd.systemd.unit=" : "systemd.unit="))
-                        continue;
-
-                if (runlevel_to_target(src[i]))
-                        continue;
-
                 /* Seems we have a good old option. Let's pass it over to the new instance. */
                 dst[(*dst_index)++] = src[i];
         }