[systemd-commits] man/systemd-nspawn.xml src/nspawn

[Michal Schmidt]

 man/systemd-nspawn.xml |    4 +---
 src/nspawn/nspawn.c    |    5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 1ddf879acf388a4625150c3a97b76458f6d2a070
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Feb 25 18:33:08 2013 +0100

    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.

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 8396def..5cba40b 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 c346f58..b8962e9 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;
 }