diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-09-19 17:16:53 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-09-19 21:36:33 +0800 |
| commit | f611bde3f182e9a4befb48a0160d1831708aca67 (patch) | |
| tree | cacf467246c85c491bf91b3fe46c448c5fdbab94 /discover/pb-discover.c | |
| parent | 4926cde5c97d09794ec33cca1321bb05a8d43304 (diff) | |
| download | talos-petitboot-f611bde3f182e9a4befb48a0160d1831708aca67.tar.gz talos-petitboot-f611bde3f182e9a4befb48a0160d1831708aca67.zip | |
discover: Remove unnecessary event passing
Currently, we pass "events" between the udev, user-event and
device-handler layers. These events all get sent through
device_handler_event, then de-multiplexed to an appropriate handler,
depending on their source.
Instead, just export relevant device_handler functions, and have the
(old) event sources call these functions directly.
This also means we can include a lot more of the device hander code in
the parser tests.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/pb-discover.c')
| -rw-r--r-- | discover/pb-discover.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/discover/pb-discover.c b/discover/pb-discover.c index c16d690..26df9b3 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -158,8 +158,6 @@ int main(int argc, char *argv[]) signal(SIGINT, sigint_handler); - config_init(NULL); - if (opts.no_autoboot == opt_yes) config_set_autoboot(false); @@ -173,6 +171,8 @@ int main(int argc, char *argv[]) if (!procset) return EXIT_FAILURE; + config_init(NULL); + network = network_init(server, waitset, opts.dry_run == opt_yes); if (!network) return EXIT_FAILURE; |
