discover: move device sources to the device handler

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 6def0900bc73cddf56397c67641825899e8abde1..713d99d3cee1cdcd1061164a017447df5bc5962e 100644 (file)
--- 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,7 +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);
+
+       system_info_init(server);
 
        handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
        if (!handler)
@@ -179,29 +176,20 @@ 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;
        }
 
        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;
 }