On Wed, 28 Mar 2018 15:15:16 +0200 Michal Suchanek <msuchanek@xxxxxxx> wrote: > It is parsed separately to save a few CPU cycles when setting up other > options but it just complicates the code. So fold it back and set up all > flags for both KEXEC_LOAD and KEXEC_FILE_LOAD > > Signed-off-by: Michal Suchanek <msuchanek@xxxxxxx> > --- > kexec/kexec.c | 25 ++++--------------------- > 1 file changed, 4 insertions(+), 21 deletions(-) > > diff --git a/kexec/kexec.c b/kexec/kexec.c > index b793f31ea501..68ae0594d4a7 100644 > --- a/kexec/kexec.c > +++ b/kexec/kexec.c >[...] > @@ -1354,11 +1340,8 @@ int main(int argc, char *argv[]) > do_exec = 0; > do_shutdown = 0; > do_sync = 0; > - if (do_kexec_file_syscall) > - kexec_file_flags |= KEXEC_FILE_ON_CRASH; > - else > - kexec_flags = KEXEC_ON_CRASH; > - break; Argh. This break was rather important. "kexec -p" now segfaults on me, as it falls through to parsing non-existent optarg. :-( Petr T > + kexec_file_flags |= KEXEC_FILE_ON_CRASH; > + kexec_flags = KEXEC_ON_CRASH; > case OPT_MEM_MIN: > mem_min = strtoul(optarg, &endptr, 0); > if (*endptr) { > @@ -1383,7 +1366,7 @@ int main(int argc, char *argv[]) > do_reuse_initrd = 1; > break; > case OPT_KEXEC_FILE_SYSCALL: > - /* We already parsed it. Nothing to do. */ > + do_kexec_file_syscall = 1; > break; > case OPT_STATUS: > do_status = 1; _______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec