diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2013-02-25 18:33:08 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2013-02-25 18:39:16 +0100 |
| commit | 1ddf879acf388a4625150c3a97b76458f6d2a070 (patch) | |
| tree | 33f3141af1b5b3fd6a70d6fdd4a813d94572b4b4 | |
| parent | 317c96d944e01e6e87200dd7ebe964fe9774d2c4 (diff) | |
Revert "nspawn: catch config mistake of specifying -b and args"
This reverts commit cb96a2c69a312fb089fef4501650f4fc40a1420b.
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.
| -rw-r--r-- | man/systemd-nspawn.xml | 4 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 8396def003..5cba40bcd4 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -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> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index c346f58412..b8962e9894 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -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; } |