X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=fd370685653f979419943ee03db5c3b64f311f5f;hp=6def0900bc73cddf56397c67641825899e8abde1;hb=b5f9e34d85075afe7aa87b5ce4a1a2d911468e36;hpb=b324b03e2b603dafddfaac607e5f98d9cd9c0f04

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 6def090..fd37068 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -11,14 +11,14 @@
 
 #include <waiter/waiter.h>
 #include <log/log.h>
-#include <pb-config/pb-config.h>
 #include <process/process.h>
+#include <talloc/talloc.h>
+#include <i18n/i18n.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)
 {
@@ -30,7 +30,7 @@ static void print_usage(void)
 	print_version();
 	printf(
 "Usage: pb-discover [-a, --no-autoboot] [-h, --help] [-l, --log log-file]\n"
-"                   [-n, --dry-run] [-V, --version]\n");
+"                   [-n, --dry-run] [-v, --verbose] [-V, --version]\n");
 }
 
 /**
@@ -49,6 +49,7 @@ struct opts {
 	const char *log_file;
 	enum opt_value dry_run;
 	enum opt_value show_version;
+	enum opt_value verbose;
 };
 
 /**
@@ -62,14 +63,16 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		{"help",           no_argument,       NULL, 'h'},
 		{"log",            required_argument, NULL, 'l'},
 		{"dry-run",        no_argument,       NULL, 'n'},
+		{"verbose",        no_argument,       NULL, 'v'},
 		{"version",        no_argument,       NULL, 'V'},
 		{ NULL, 0, NULL, 0},
 	};
-	static const char short_options[] = "ahl:nV";
+	static const char short_options[] = "ahl:nvV";
 	static const struct opts default_values = {
 		.no_autoboot = opt_no,
 		.log_file = "/var/log/petitboot/pb-discover.log",
 		.dry_run = opt_no,
+		.verbose = opt_no,
 	};
 
 	*opts = default_values;
@@ -94,6 +97,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		case 'n':
 			opts->dry_run = opt_yes;
 			break;
+		case 'v':
+			opts->verbose = opt_yes;
+			break;
 		case 'V':
 			opts->show_version = opt_yes;
 			break;
@@ -117,14 +123,15 @@ 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;
 
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
 	if (opts_parse(&opts, argc, argv)) {
 		print_usage();
 		return EXIT_FAILURE;
@@ -151,6 +158,9 @@ int main(int argc, char *argv[])
 	}
 	pb_log_init(log);
 
+	if (opts.verbose == opt_yes)
+		pb_log_set_debug(true);
+
 	pb_log("--- pb-discover ---\n");
 
 	/* we look for closed sockets when we write, so ignore SIGPIPE */
@@ -158,9 +168,6 @@ int main(int argc, char *argv[])
 
 	signal(SIGINT, sigint_handler);
 
-	if (opts.no_autoboot == opt_yes)
-		config_set_autoboot(false);
-
 	waitset = waitset_create(NULL);
 
 	server = discover_server_init(waitset);
@@ -171,26 +178,23 @@ int main(int argc, char *argv[])
 	if (!procset)
 		return EXIT_FAILURE;
 
-	config_init(NULL);
+	platform_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;
+	if (config_get()->lang)
+		setlocale(LC_ALL, config_get()->lang);
 
-	discover_server_set_device_source(server, handler);
+	if (config_get()->debug)
+		pb_log_set_debug(true);
 
-	/* init our device sources: udev, network and user events */
-	udev = udev_init(waitset, handler);
-	if (!udev)
-		return EXIT_FAILURE;
+	system_info_init(server);
 
-	network = network_init(handler, waitset, opts.dry_run == opt_yes);
-	if (!network)
+	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
+	if (!handler)
 		return EXIT_FAILURE;
 
-	uev = user_event_init(waitset, handler);
-	if (!uev)
-		return EXIT_FAILURE;
+	discover_server_set_device_source(server, handler);
 
 	for (running = 1; running;) {
 		if (waiter_poll(waitset))
@@ -198,10 +202,14 @@ int main(int argc, char *argv[])
 	}
 
 	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;
 }