X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=986401d9fff6f434bff7c9c007f4e50548961341;hp=6966ba4408f45e4ff734fc2ca2f6cf8028ff77d3;hb=4466139b7bf4573b6b85555bb1ff7e31fbaaa934;hpb=01f60e05ef83e3b91f7084ed95e6cc07412c8bb9 diff --git a/discover/pb-discover.c b/discover/pb-discover.c index 6966ba4..986401d 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -11,11 +11,13 @@ #include #include +#include #include "udev.h" #include "user-event.h" #include "discover-server.h" #include "device-handler.h" +#include "network.h" static void print_version(void) { @@ -107,6 +109,7 @@ int main(int argc, char *argv[]) { struct device_handler *handler; struct discover_server *server; + struct network *network; struct waitset *waitset; struct opts opts; struct pb_udev *udev; @@ -145,12 +148,18 @@ int main(int argc, char *argv[]) signal(SIGINT, sigint_handler); + config_init(NULL); + waitset = waitset_create(NULL); server = discover_server_init(waitset); if (!server) return EXIT_FAILURE; + network = network_init(server, waitset, opts.dry_run == opt_yes); + if (!network) + return EXIT_FAILURE; + handler = device_handler_init(server, waitset, opts.dry_run == opt_yes); if (!handler) return EXIT_FAILURE; @@ -175,6 +184,7 @@ int main(int argc, char *argv[]) device_handler_destroy(handler); waitset_destroy(waitset); udev_destroy(udev); + config_fini(); pb_log("--- end ---\n");