X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=713d99d3cee1cdcd1061164a017447df5bc5962e;hp=bb590a9314f549a9ad6219020767a3f2004507ec;hb=edcfca78ac49793e295ac97328942321f39e3996;hpb=70fb2ec0af31c1d78c8655ef13f682d597921390

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index bb590a9..713d99d 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -14,11 +14,8 @@
 #include <process/process.h>
 #include <talloc/talloc.h>
 
-#include "udev.h"
-#include "user-event.h"
 #include "discover-server.h"
 #include "device-handler.h"
-#include "network.h"
 #include "sysinfo.h"
 #include "platform.h"
 
@@ -119,12 +116,9 @@ int main(int argc, char *argv[])
 {
 	struct device_handler *handler;
 	struct discover_server *server;
-	struct network *network;
 	struct waitset *waitset;
 	struct procset *procset;
 	struct opts opts;
-	struct pb_udev *udev;
-	struct user_event *uev;
 	FILE *log;
 
 	if (opts_parse(&opts, argc, argv)) {
@@ -182,28 +176,12 @@ int main(int argc, char *argv[])
 
 	discover_server_set_device_source(server, handler);
 
-	/* init our device sources: udev, network and user events */
-	udev = udev_init(waitset, handler);
-	if (!udev)
-		return EXIT_FAILURE;
-
-	network = network_init(handler, waitset, opts.dry_run == opt_yes);
-	if (!network)
-		return EXIT_FAILURE;
-
-	uev = user_event_init(waitset, handler);
-	if (!uev)
-		return EXIT_FAILURE;
-
 	for (running = 1; running;) {
 		if (waiter_poll(waitset))
 			break;
 	}
 
-	network_shutdown(network);
 	device_handler_destroy(handler);
-	user_event_destroy(uev);
-	udev_destroy(udev);
 	discover_server_destroy(server);
 	platform_fini();
 	talloc_free(waitset);