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

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 986401d..c16d690 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -12,6 +12,7 @@
 #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"
@@ -28,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");
 }
 
 /**
@@ -42,10 +44,11 @@ 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 show_version;
 	enum opt_value dry_run;
+	enum opt_value show_version;
 };
 
 /**
@@ -55,14 +58,16 @@ 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:nV";
+	static const char short_options[] = "ahl:nV";
 	static const struct opts default_values = {
+		.no_autoboot = opt_no,
 		.log_file = "/var/log/petitboot/pb-discover.log",
 		.dry_run = opt_no,
 	};
@@ -77,6 +82,9 @@ 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;
@@ -111,9 +119,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();
@@ -130,17 +140,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 */
@@ -150,12 +160,19 @@ int main(int argc, char *argv[])
 
 	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, 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;
@@ -174,15 +191,12 @@ int main(int argc, char *argv[])
 	if (!uev)
 		return EXIT_FAILURE;
 
-	user_event_trigger(uev);
-
 	for (running = 1; running;) {
 		if (waiter_poll(waitset))
 			break;
 	}
 
 	device_handler_destroy(handler);
-	waitset_destroy(waitset);
 	udev_destroy(udev);
 	config_fini();