X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=986401d9fff6f434bff7c9c007f4e50548961341;hp=ffe4a12ee050b00abd4f2b9e8a612a8f297e4cbb;hb=4466139b7bf4573b6b85555bb1ff7e31fbaaa934;hpb=89e608b7476468fb4e0d469deee5d7831c443f05

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index ffe4a12..986401d 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,11 +11,13 @@
 
 #include <waiter/waiter.h>
 #include <log/log.h>
+#include <pb-config/pb-config.h>
 
 #include "udev.h"
 #include "user-event.h"
 #include "discover-server.h"
 #include "device-handler.h"
+#include "network.h"
 
 static void print_version(void)
 {
@@ -107,9 +109,10 @@ int main(int argc, char *argv[])
 {
 	struct device_handler *handler;
 	struct discover_server *server;
+	struct network *network;
 	struct waitset *waitset;
 	struct opts opts;
-	struct udev *udev;
+	struct pb_udev *udev;
 	struct user_event *uev;
 
 	if (opts_parse(&opts, argc, argv)) {
@@ -145,13 +148,19 @@ 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;
 
-	handler = device_handler_init(server, opts.dry_run == opt_yes);
+	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;
 
@@ -165,7 +174,6 @@ int main(int argc, char *argv[])
 	if (!uev)
 		return EXIT_FAILURE;
 
-	udev_trigger(udev);
 	user_event_trigger(uev);
 
 	for (running = 1; running;) {
@@ -176,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");