X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=bb590a9314f549a9ad6219020767a3f2004507ec;hp=ccd1c7daba597441c9df3dac3e67f89ed2aeab50;hb=c14b12980885edd035322cd3bc87efff444c39b1;hpb=e1248d2838676fe39c4aaa43adf120e630e9d387

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index ccd1c7d..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)
 {
@@ -168,10 +170,12 @@ 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)
 		return EXIT_FAILURE;
@@ -196,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;
 }