mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
Revert "nspawn: catch config mistake of specifying -b and args"
This reverts commit cb96a2c69a.
It is not a mistake to pass args when -b is specified. They will simply
be passed on to the container's init.
The manpage needs fixing, that's true.
This commit is contained in:
@@ -170,9 +170,7 @@
|
||||
<listitem><para>Automatically search
|
||||
for an init binary and invoke it
|
||||
instead of a shell or a user supplied
|
||||
program. A command to execute cannot
|
||||
be specified in this case.
|
||||
</para></listitem>
|
||||
program.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
|
||||
@@ -267,11 +267,6 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
}
|
||||
}
|
||||
|
||||
if (optind < argc && arg_boot) {
|
||||
log_error("Cannot specify a command together with '-b'");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user