X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=d8708a3d40194d9d2017d41058a4ed57f8971b6e;hp=70f0365af65fa76281311a52eb603adcb4555801;hb=416647ec10a0ca505de35348620391fde80043c0;hpb=c24015f626b8249ba300ea311892856dc0134c2b

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 70f0365..d8708a3 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -12,12 +12,15 @@
 #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"
 
 static void print_version(void)
 {
@@ -118,9 +121,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 +142,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,47 +160,58 @@ 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);
+
+	system_info_init(server);
+
 	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;
 
-	user_event_trigger(uev);
-
 	for (running = 1; running;) {
 		if (waiter_poll(waitset))
 			break;
 	}
 
+	network_shutdown(network);
 	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;
 }