nspawn: catch config mistake of specifying -b and args

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 5cba40bcd427ef7fdbcd086ffbccd59bb7daa1e9..8396def003e59b3b61f793938ec6a7ab0108804b 100644 (file)
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -170,7 +170,9 @@
                                 <listitem><para>Automatically search
                                 for an init binary and invoke it
                                 instead of a shell or a user supplied
-                                program.</para></listitem>
+                                program. A command to execute cannot
+                                be specified in this case.
+                                </para></listitem>
                         </varlistentry>
 
                         <varlistentry>

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index b8962e9894480a0010326c2ba60800f9400bc1d7..c346f58412e6add45d8d4a42752d2608a068e96a 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -267,6 +267,11 @@ 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;
 }