X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=713d99d3cee1cdcd1061164a017447df5bc5962e;hp=26df9b3ff3f6062f9bdc85c85ae1dde068cc8e92;hb=85bd33ca9777c386359b9b3899888316354a4e1f;hpb=f611bde3f182e9a4befb48a0160d1831708aca67

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 26df9b3..713d99d 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,14 +11,13 @@
 
 #include <waiter/waiter.h>
 #include <log/log.h>
-#include <pb-config/pb-config.h>
 #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"
 
 static void print_version(void)
 {
@@ -117,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)) {
@@ -158,9 +154,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);
@@ -171,11 +164,11 @@ int main(int argc, char *argv[])
 	if (!procset)
 		return EXIT_FAILURE;
 
-	config_init(NULL);
+	platform_init(NULL);
+	if (opts.no_autoboot == opt_yes)
+		config_set_autoboot(false);
 
-	network = network_init(server, waitset, opts.dry_run == opt_yes);
-	if (!network)
-		return EXIT_FAILURE;
+	system_info_init(server);
 
 	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
 	if (!handler)
@@ -183,24 +176,20 @@ int main(int argc, char *argv[])
 
 	discover_server_set_device_source(server, handler);
 
-	udev = udev_init(waitset, handler);
-	if (!udev)
-		return EXIT_FAILURE;
-
-	uev = user_event_init(waitset, handler);
-	if (!uev)
-		return EXIT_FAILURE;
-
 	for (running = 1; running;) {
 		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
-	udev_destroy(udev);
-	config_fini();
+	discover_server_destroy(server);
+	platform_fini();
+	talloc_free(waitset);
 
 	pb_log("--- end ---\n");
 
+	if (log != stderr)
+		fclose(log);
+
 	return EXIT_SUCCESS;
 }