discover: Rename default_enabled

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index c83b5747ee0ded939f69df4bbe5976fe51f9be20..986401d9fff6f434bff7c9c007f4e50548961341 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,11 +11,13 @@
 
 #include <waiter/waiter.h>
 #include <log/log.h>
+#include <pb-config/pb-config.h>
 
 #include "udev.h"
 #include "user-event.h"
 #include "discover-server.h"
 #include "device-handler.h"
+#include "network.h"
 
 static void print_version(void)
 {
@@ -107,9 +109,10 @@ int main(int argc, char *argv[])
 {
        struct device_handler *handler;
        struct discover_server *server;
+       struct network *network;
        struct waitset *waitset;
        struct opts opts;
-       struct udev *udev;
+       struct pb_udev *udev;
        struct user_event *uev;
 
        if (opts_parse(&opts, argc, argv)) {
@@ -145,13 +148,19 @@ int main(int argc, char *argv[])
 
        signal(SIGINT, sigint_handler);
 
+       config_init(NULL);
+
        waitset = waitset_create(NULL);
 
        server = discover_server_init(waitset);
        if (!server)
                return EXIT_FAILURE;
 
-       handler = device_handler_init(server, opts.dry_run == opt_yes);
+       network = network_init(server, waitset, opts.dry_run == opt_yes);
+       if (!network)
+               return EXIT_FAILURE;
+
+       handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
        if (!handler)
                return EXIT_FAILURE;
 
@@ -165,7 +174,6 @@ int main(int argc, char *argv[])
        if (!uev)
                return EXIT_FAILURE;
 
-       udev_trigger(udev);
        user_event_trigger(uev);
 
        for (running = 1; running;) {
@@ -175,6 +183,8 @@ int main(int argc, char *argv[])
 
        device_handler_destroy(handler);
        waitset_destroy(waitset);
+       udev_destroy(udev);
+       config_fini();
 
        pb_log("--- end ---\n");