X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=713d99d3cee1cdcd1061164a017447df5bc5962e;hp=6d62e14db2b931e20afdeb55f82cebb0a8b9e31b;hb=edcfca78ac49793e295ac97328942321f39e3996;hpb=815df381d55e09fd291145ef2b86729c12583366

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 6d62e14..713d99d 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,14 +11,13 @@
 
 #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)
 {
@@ -117,12 +116,10 @@ int main(int argc, char *argv[])
 {
 	struct device_handler *handler;
 	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();
@@ -139,17 +136,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 +154,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 +164,11 @@ 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;
+	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,24 +176,20 @@ int main(int argc, char *argv[])
 
 	discover_server_set_device_source(server, handler);
 
-	udev = udev_init(waitset, handler);
-	if (!udev)
-		return EXIT_FAILURE;
-
-	uev = user_event_init(waitset, handler);
-	if (!uev)
-		return EXIT_FAILURE;
-
 	for (running = 1; running;) {
 		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
-	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;
 }