X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fmain.c;h=f1b06d88803e85ef72f507df1b9fb9d5bbe9878d;hb=236af516b866473c22f980b556a2d7535cef4d9b;hp=18d0927b7a4191c2814b68effc2ea57360bacae9;hpb=059cb3858acd038ff2cef10a3a99119bf71a8fc6;p=elogind.git diff --git a/src/core/main.c b/src/core/main.c index 18d0927b7..f1b06d888 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -374,6 +374,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { log_warning("Environment variable name '%s' is not valid. Ignoring.", value); } else if (!streq(key, "systemd.restore_state") && + !streq(key, "systemd.gpt_auto") && (startswith(key, "systemd.") || startswith(key, "rd.systemd."))) { const char *c; @@ -1993,7 +1994,7 @@ finish: if (log_get_show_location()) command_line[pos++] = "--log-location"; - assert(pos + 1 < ELEMENTSOF(command_line)); + assert(pos < ELEMENTSOF(command_line)); if (arm_reboot_watchdog && arg_shutdown_watchdog > 0) { char *e;