From 1ddf879acf388a4625150c3a97b76458f6d2a070 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 25 Feb 2013 18:33:08 +0100 Subject: 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. --- src/nspawn/nspawn.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/nspawn') 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; } -- cgit v1.2.3-54-g00ecf