X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpb-discover.c;h=c16d6903ed5c1da180dfd615beed1950c824b20b;hp=bd515e327cc9c94d75cd0c9ec3eb9de622a553ca;hb=307b4b091e0bc298964e90888bf179431e32c134;hpb=e93e46bfecdef5511953cd3ce1f01b0546d98af8

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index bd515e3..c16d690 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -7,14 +7,18 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <string.h>
 
 #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"
 #include "discover-server.h"
 #include "device-handler.h"
+#include "network.h"
 
 static void print_version(void)
 {
@@ -25,7 +29,8 @@ static void print_usage(void)
 {
 	print_version();
 	printf(
-"Usage: pb-discover [-h, --help] [-l, --log log-file] [-V, --version]\n");
+"Usage: pb-discover [-a, --no-autoboot] [-h, --help] [-l, --log log-file]\n"
+"                   [-n, --dry-run] [-V, --version]\n");
 }
 
 /**
@@ -39,8 +44,10 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
+	enum opt_value no_autoboot;
 	enum opt_value show_help;
 	const char *log_file;
+	enum opt_value dry_run;
 	enum opt_value show_version;
 };
 
@@ -51,14 +58,18 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
 	static const struct option long_options[] = {
+		{"no-autoboot",    no_argument,       NULL, 'a'},
 		{"help",           no_argument,       NULL, 'h'},
 		{"log",            required_argument, NULL, 'l'},
+		{"dry-run",        no_argument,       NULL, 'n'},
 		{"version",        no_argument,       NULL, 'V'},
 		{ NULL, 0, NULL, 0},
 	};
-	static const char short_options[] = "hl:V";
+	static const char short_options[] = "ahl:nV";
 	static const struct opts default_values = {
-		.log_file = "pb-discover.log",
+		.no_autoboot = opt_no,
+		.log_file = "/var/log/petitboot/pb-discover.log",
+		.dry_run = opt_no,
 	};
 
 	*opts = default_values;
@@ -71,12 +82,18 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 			break;
 
 		switch (c) {
+		case 'a':
+			opts->no_autoboot = opt_yes;
+			break;
 		case 'h':
 			opts->show_help = opt_yes;
 			break;
 		case 'l':
 			opts->log_file = optarg;
 			break;
+		case 'n':
+			opts->dry_run = opt_yes;
+			break;
 		case 'V':
 			opts->show_version = opt_yes;
 			break;
@@ -100,8 +117,11 @@ 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 udev *udev;
+	struct pb_udev *udev;
 	struct user_event *uev;
 	FILE *log;
 
@@ -120,13 +140,17 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
-	log = fopen(opts.log_file, "a");
-	assert(log);
-	pb_log_set_stream(log);
+	log = stderr;
+	if (strcmp(opts.log_file, "-")) {
+		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 */
@@ -134,33 +158,47 @@ int main(int argc, char *argv[])
 
 	signal(SIGINT, sigint_handler);
 
-	server = discover_server_init();
+	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;
 
-	handler = device_handler_init(server);
+	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;
+
+	handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
 	if (!handler)
 		return EXIT_FAILURE;
 
 	discover_server_set_device_source(server, handler);
 
-	udev = udev_init(handler);
+	udev = udev_init(waitset, handler);
 	if (!udev)
 		return EXIT_FAILURE;
 
-	uev = user_event_init(handler);
+	uev = user_event_init(waitset, handler);
 	if (!uev)
 		return EXIT_FAILURE;
 
-	udev_trigger(udev);
-	user_event_trigger(uev);
-
 	for (running = 1; running;) {
-		if (waiter_poll())
+		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
+	udev_destroy(udev);
+	config_fini();
 
 	pb_log("--- end ---\n");