discover: Don't call config_set_autoboot before config_init

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 6d62e14db2b931e20afdeb55f82cebb0a8b9e31b..ccd1c7daba597441c9df3dac3e67f89ed2aeab50 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -123,6 +123,7 @@ int main(int argc, char *argv[])
        struct opts opts;
        struct pb_udev *udev;
        struct user_event *uev;
+       FILE *log;
 
        if (opts_parse(&opts, argc, argv)) {
                print_usage();
@@ -139,17 +140,17 @@ int main(int argc, char *argv[])
                return EXIT_SUCCESS;
        }
 
+       log = stderr;
        if (strcmp(opts.log_file, "-")) {
-               FILE *log = fopen(opts.log_file, "a");
-
-               assert(log);
-               pb_log_set_stream(log);
-       } else
-               pb_log_set_stream(stderr);
+               log = fopen(opts.log_file, "a");
+               if (!log) {
+                       fprintf(stderr, "can't open log file %s, logging to "
+                                       "stderr\n", opts.log_file);
+                       log = stderr;
+               }
+       }
+       pb_log_init(log);
 
-#if defined(DEBUG)
-       pb_log_always_flush(1);
-#endif
        pb_log("--- pb-discover ---\n");
 
        /* we look for closed sockets when we write, so ignore SIGPIPE */
@@ -157,11 +158,6 @@ int main(int argc, char *argv[])
 
        signal(SIGINT, sigint_handler);
 
-       config_init(NULL);
-
-       if (opts.no_autoboot == opt_yes)
-               config_set_autoboot(false);
-
        waitset = waitset_create(NULL);
 
        server = discover_server_init(waitset);
@@ -172,9 +168,9 @@ int main(int argc, char *argv[])
        if (!procset)
                return EXIT_FAILURE;
 
-       network = network_init(server, waitset, opts.dry_run == opt_yes);
-       if (!network)
-               return EXIT_FAILURE;
+       config_init(NULL);
+       if (opts.no_autoboot == opt_yes)
+               config_set_autoboot(false);
 
        handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
        if (!handler)
@@ -182,10 +178,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;