X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=cafd23a5778258db070b8b612889e2db4681c1a0;hp=983ba474917ab629a47b2c36b61398c31125452c;hb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c;hpb=6b842bb2559116a949c6a569ac39f5c56ebc1be1

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 983ba47..cafd23a 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -18,11 +18,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#if defined(HAVE_CONFIG_H)
 #include "config.h"
-#endif
 
 #define _GNU_SOURCE
+
+#include <assert.h>
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
@@ -45,7 +45,7 @@ static void print_usage(void)
 {
 	print_version();
 	printf(
-"Usage: petitboot-nc [-d, --dry-run] [-h, --help] [-l, --log log-file]\n"
+"Usage: petitboot-nc [-h, --help] [-l, --log log-file]\n"
 "                    [-s, --start-daemon] [-V, --version]\n");
 }
 
@@ -60,7 +60,6 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
-	enum opt_value dry_run;
 	enum opt_value show_help;
 	const char *log_file;
 	enum opt_value start_daemon;
@@ -74,7 +73,6 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
 	static const struct option long_options[] = {
-		{"dry-run",      no_argument,       NULL, 'd'},
 		{"help",         no_argument,       NULL, 'h'},
 		{"log",          required_argument, NULL, 'l'},
 		{"start-daemon", no_argument,       NULL, 's'},
@@ -96,9 +94,6 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 			break;
 
 		switch (c) {
-		case 'd':
-			opts->dry_run = opt_yes;
-			break;
 		case 'h':
 			opts->show_help = opt_yes;
 			break;
@@ -131,31 +126,6 @@ struct pb_cui {
 	struct cui *cui;
 };
 
-static struct pb_cui *pb_from_cui(struct cui *cui)
-{
-	struct pb_cui *pb;
-
-	assert(cui->c_sig == pb_cui_sig);
-	pb = cui->platform_info;
-	assert(pb->cui->c_sig == pb_cui_sig);
-	return pb;
-}
-
-/**
- * pb_kexec_cb - The kexec callback.
- */
-
-static int pb_kexec_cb(struct cui *cui, struct cui_opt_data *cod)
-{
-	struct pb_cui *pb = pb_from_cui(cui);
-
-	pb_log("%s: %s\n", __func__, cod->name);
-
-	assert(pb->cui->current == &pb->cui->main->scr);
-
-	return pb_run_kexec(cod->bd, pb->cui->dry_run);
-}
-
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -176,8 +146,7 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui)
 	m->on_open = cui_on_open;
 
 	m->scr.frame.title = talloc_asprintf(m,
-		"Petitboot (" PACKAGE_VERSION ")%s",
-		(pb_cui->cui->dry_run ? " (dry-run)" : ""));
+		"Petitboot (" PACKAGE_VERSION ")");
 	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");
@@ -211,10 +180,6 @@ static void sig_handler(int signum)
 	DBGS("%d\n", signum);
 
 	switch (signum) {
-	case SIGALRM:
-		if (pb.cui)
-			ui_timer_sigalrm(&pb.cui->timer);
-		break;
 	case SIGWINCH:
 		if (pb.cui)
 			cui_resize(pb.cui);
@@ -262,6 +227,9 @@ int main(int argc, char *argv[])
 	if (strcmp(opts.log_file, "-")) {
 		FILE *log = fopen(opts.log_file, "a");
 
+		if (!log)
+			log = fopen("/dev/null", "a");
+
 		assert(log);
 		pb_log_set_stream(log);
 	} else
@@ -285,14 +253,12 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon,
-		opts.dry_run);
+	pb.cui = cui_init(&pb, NULL, opts.start_daemon);
 
 	if (!pb.cui)
 		return EXIT_FAILURE;
 
 	pb.mm = pb_mm_init(&pb);
-	ui_timer_disable(&pb.cui->timer);
 
 	cui_result = cui_run(pb.cui, pb.mm, 0);