X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=ccd1c7daba597441c9df3dac3e67f89ed2aeab50;hp=a0535c2f5e6639a423ffba3bcd534aae408ba8fc;hb=e1248d2838676fe39c4aaa43adf120e630e9d387;hpb=e12710c40ea278209c03d8351936f32964ad5c18

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index a0535c2..ccd1c7d 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -12,6 +12,7 @@
 #include <waiter/waiter.h>
 #include <log/log.h>
 #include <pb-config/pb-config.h>
+#include <process/process.h>
 
 #include "udev.h"
 #include "user-event.h"
@@ -118,9 +119,11 @@ int main(int argc, char *argv[])
 	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)) {
 		print_usage();
@@ -137,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 */
@@ -155,31 +158,35 @@ 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);
 	if (!server)
 		return EXIT_FAILURE;
 
-	network = network_init(server, waitset, opts.dry_run == opt_yes);
-	if (!network)
+	procset = process_init(server, waitset, opts.dry_run == opt_yes);
+	if (!procset)
 		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)
 		return EXIT_FAILURE;
 
 	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;