discover: Use pxeconffile for udhcpc option name

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 26df9b3ff3f6062f9bdc85c85ae1dde068cc8e92..b15413090e49fefc34b84ef0f7f0385328994ad5 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -13,12 +13,14 @@
 #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"
 
 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);
@@ -172,10 +171,10 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
 
        config_init(NULL);
+       if (opts.no_autoboot == opt_yes)
+               config_set_autoboot(false);
 
-       network = network_init(server, waitset, opts.dry_run == opt_yes);
-       if (!network)
-               return EXIT_FAILURE;
+       system_info_init(server);
 
        handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
        if (!handler)
@@ -183,10 +182,15 @@ 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;
@@ -197,10 +201,16 @@ int main(int argc, char *argv[])
        }
 
        device_handler_destroy(handler);
+       user_event_destroy(uev);
        udev_destroy(udev);
+       discover_server_destroy(server);
        config_fini();
+       talloc_free(waitset);
 
        pb_log("--- end ---\n");
 
+       if (log != stderr)
+               fclose(log);
+
        return EXIT_SUCCESS;
 }