diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-10-09 13:19:58 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-10-09 15:04:25 +0800 |
| commit | e1248d2838676fe39c4aaa43adf120e630e9d387 (patch) | |
| tree | 6f04961b4c45ad42dcc48fcd10ce59c5771c45df | |
| parent | bd5c147d5e39a10469876048df12348dc556c20c (diff) | |
| download | talos-petitboot-e1248d2838676fe39c4aaa43adf120e630e9d387.tar.gz talos-petitboot-e1248d2838676fe39c4aaa43adf120e630e9d387.zip | |
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 <jk@ozlabs.org>
| -rw-r--r-- | discover/pb-discover.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) |
