diff options
| -rw-r--r-- | src/main.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/src/main.c b/src/main.c index 5b75ecca8e..1d6ac42e90 100644 --- a/src/main.c +++ b/src/main.c @@ -828,30 +828,28 @@ static int parse_argv(int argc, char *argv[]) { break; } - if (optind < argc) { - if (getpid() != 1) { - /* Hmm, when we aren't run as init system - * let's complain about excess arguments */ - - log_error("Excess arguments."); - return -EINVAL; - - } else if (detect_container(NULL) > 0) { - char **a; - - /* All /proc/cmdline arguments the kernel - * didn't understand it passed to us. We're - * note really interested in that usually - * since /proc/cmdline is more interesting and - * complete. With one exception: if we are run - * in a container /proc/cmdline is not - * relevant for us, hence we rely on argv[] - * instead. */ - - for (a = argv; a < argv + argc; a++) - if ((r = parse_proc_cmdline_word(*a)) < 0) - return r; - } + if (optind < argc && getpid() != 1) { + /* Hmm, when we aren't run as init system + * let's complain about excess arguments */ + + log_error("Excess arguments."); + return -EINVAL; + } + + if (detect_container(NULL) > 0) { + char **a; + + /* All /proc/cmdline arguments the kernel didn't + * understand it passed to us. We're not really + * interested in that usually since /proc/cmdline is + * more interesting and complete. With one exception: + * if we are run in a container /proc/cmdline is not + * relevant for the container, hence we rely on argv[] + * instead. */ + + for (a = argv; a < argv + argc; a++) + if ((r = parse_proc_cmdline_word(*a)) < 0) + return r; } return 0; |