X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=bb590a9314f549a9ad6219020767a3f2004507ec;hp=6def0900bc73cddf56397c67641825899e8abde1;hb=c70e102425ecc261dc9fa740ce7e2296c5d39f4e;hpb=b324b03e2b603dafddfaac607e5f98d9cd9c0f04

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 6def090..bb590a9 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,14 +11,16 @@
 
 #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)
 {
@@ -158,9 +160,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,7 +170,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);
+
+	system_info_init(server);
 
 	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
 	if (!handler)
@@ -197,11 +200,18 @@ int main(int argc, char *argv[])
 			break;
 	}
 
+	network_shutdown(network);
 	device_handler_destroy(handler);
+	user_event_destroy(uev);
 	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;
 }