Merge pull request #23883 from yuwata/pid1-do-not-filter-out-systemd-unit

core: do not filter out systemd.unit= from kernel command line
This commit is contained in:
Yu Watanabe 2022-07-02 09:42:09 +09:00 committed by GitHub
commit a96e670844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions

View 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];
}

View file

@ -3,6 +3,10 @@
set -eux
set -o pipefail
# Simple test for that daemon-reexec works in container.
# See: https://github.com/systemd/systemd/pull/23883
systemctl daemon-reexec
# Test merging of a --job-mode=ignore-dependencies job into a previously
# installed job.