pb-config: Move config storage modules to "platform" modules in discover code

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 9b1f20041da7a7a764233abc4f1d3499775be2a1..bb590a9314f549a9ad6219020767a3f2004507ec 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,8 +11,8 @@
 
 #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"
@@ -20,6 +20,7 @@
 #include "device-handler.h"
 #include "network.h"
 #include "sysinfo.h"
+#include "platform.h"
 
 static void print_version(void)
 {
@@ -169,7 +170,7 @@ 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);
 
@@ -199,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;
 }