X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=dfeb1ba6217a331dd3ce181d1b49282ea781e0b7;hp=6b8f5bacd92eb95c155727904d6bea5c7a910d8d;hb=e01ca9726e5ce96605cb57595999885fde18884b;hpb=604a1ccf072f9f33326fb6dc919c1b6233d40866

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 6b8f5ba..dfeb1ba 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -45,8 +45,8 @@ static void print_usage(void)
 {
 	print_version();
 	printf(
-"Usage: petitboot-nc [-d, --start-daemon] [-h, --help] [-l, --log log-file]\n"
-"                    [-V, --version]\n");
+"Usage: petitboot-nc [-d, --dry-run] [-h, --help] [-l, --log log-file]\n"
+"                    [-s, --start-daemon] [-V, --version]\n");
 }
 
 /**
@@ -60,9 +60,10 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
-	enum opt_value start_daemon;
+	enum opt_value dry_run;
 	enum opt_value show_help;
 	const char *log_file;
+	enum opt_value start_daemon;
 	enum opt_value show_version;
 };
 
@@ -73,13 +74,14 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
 	static const struct option long_options[] = {
-		{"start-daemon", no_argument,       NULL, 'd'},
+		{"dry-run",      no_argument,       NULL, 'd'},
 		{"help",         no_argument,       NULL, 'h'},
 		{"log",          required_argument, NULL, 'l'},
+		{"start-daemon", no_argument,       NULL, 's'},
 		{"version",      no_argument,       NULL, 'V'},
 		{ NULL,          0,                 NULL, 0},
 	};
-	static const char short_options[] = "dhl:V";
+	static const char short_options[] = "dhl:sV";
 	static const struct opts default_values = {
 		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
@@ -95,7 +97,7 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 
 		switch (c) {
 		case 'd':
-			opts->start_daemon = opt_yes;
+			opts->dry_run = opt_yes;
 			break;
 		case 'h':
 			opts->show_help = opt_yes;
@@ -103,6 +105,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		case 'l':
 			opts->log_file = optarg;
 			break;
+		case 's':
+			opts->start_daemon = opt_yes;
+			break;
 		case 'V':
 			opts->show_version = opt_yes;
 			break;
@@ -148,7 +153,7 @@ static int pb_kexec_cb(struct cui *cui, struct cui_opt_data *cod)
 
 	assert(pb->cui->current == &pb->cui->main->scr);
 
-	return pb_run_kexec(cod->kd);
+	return pb_run_kexec(cod->kd, pb->cui->dry_run);
 }
 
 /**
@@ -170,7 +175,9 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 
 	m->on_open = cui_on_open;
 
-	m->scr.frame.title = talloc_strdup(m, "Petitboot");
+	m->scr.frame.title = talloc_asprintf(m,
+		"Petitboot (" PACKAGE_VERSION ")%s",
+		(pb_cui->cui->dry_run ? " (dry-run)" : ""));
 	m->scr.frame.help = talloc_strdup(m,
 		"ESC=exit, Enter=accept, e=edit, o=open");
 	m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
@@ -231,10 +238,9 @@ static void sig_handler(int signum)
 int main(int argc, char *argv[])
 {
 	static struct sigaction sa;
-	static struct opts opts;
 	int result;
 	int cui_result;
-	FILE *log;
+	struct opts opts;
 
 	result = opts_parse(&opts, argc, argv);
 
@@ -253,9 +259,13 @@ int main(int argc, char *argv[])
 		return EXIT_SUCCESS;
 	}
 
-	log = fopen(opts.log_file, "a");
-	assert(log);
-	pb_log_set_stream(log);
+	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);
 
 #if defined(DEBUG)
 	pb_log_always_flush(1);
@@ -275,7 +285,8 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon);
+	pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon,
+		opts.dry_run);
 
 	if (!pb.cui)
 		return EXIT_FAILURE;