X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=bb590a9314f549a9ad6219020767a3f2004507ec;hp=61da5097035ff6aedf12f6ba2c3b6692a790c170;hb=c70e102425ecc261dc9fa740ce7e2296c5d39f4e;hpb=823958fbbd17ab2c1b2a1779eb10351ca0a668c6

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 61da509..bb590a9 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,14 +11,16 @@
 
 #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"
+#include "platform.h"
 
 static void print_version(void)
 {
@@ -123,6 +125,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 +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 */
@@ -157,24 +160,21 @@ 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;
 
-	procset = process_init(server, waitset);
+	procset = process_init(server, waitset, opts.dry_run == opt_yes);
 	if (!procset)
 		return EXIT_FAILURE;
 
-	network = network_init(server, waitset, opts.dry_run == opt_yes);
-	if (!network)
-		return EXIT_FAILURE;
+	platform_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)
@@ -182,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;
@@ -195,11 +200,18 @@ int main(int argc, char *argv[])
 			break;
 	}
 
+	network_shutdown(network);
 	device_handler_destroy(handler);
+	user_event_destroy(uev);
 	udev_destroy(udev);
-	config_fini();
+	discover_server_destroy(server);
+	platform_fini();
+	talloc_free(waitset);
 
 	pb_log("--- end ---\n");
 
+	if (log != stderr)
+		fclose(log);
+
 	return EXIT_SUCCESS;
 }