From: Jeremy Kerr Date: Wed, 9 Oct 2013 05:19:58 +0000 (+0800) Subject: discover: Don't call config_set_autoboot before config_init X-Git-Tag: v1.0.0~398 X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=e1248d2838676fe39c4aaa43adf120e630e9d387;ds=sidebyside discover: Don't call config_set_autoboot before config_init Change f611bde3 shifted the config_init until after process_init, as we need to run processes during config init. We also needed to move the config_set_autoboot invocation too. Signed-off-by: Jeremy Kerr --- diff --git a/discover/pb-discover.c b/discover/pb-discover.c index 6def090..ccd1c7d 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -158,9 +158,6 @@ int main(int argc, char *argv[]) signal(SIGINT, sigint_handler); - if (opts.no_autoboot == opt_yes) - config_set_autoboot(false); - waitset = waitset_create(NULL); server = discover_server_init(waitset); @@ -172,6 +169,8 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; config_init(NULL); + if (opts.no_autoboot == opt_yes) + config_set_autoboot(false); handler = device_handler_init(server, waitset, opts.dry_run == opt_yes); if (!handler)