]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: do not filter out systemd.unit= and run-level specifier from kernel command...
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 1 Jul 2022 19:18:41 +0000 (04:18 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 1 Jul 2022 20:07:23 +0000 (05:07 +0900)
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.

src/core/main.c

index 7cd13b9e13e8aecbddc38566c94ee1d6d1386b08..94c757e21e02899b962e91673af6949e226f9efb 100644 (file)
@@ -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];
         }