X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fgeneric-main.c;h=9236a800beac18a11d1041037955687f109364c6;hp=972490acef49d2bb8e2ee0ecc4974cbbc3f52f15;hb=63575c2045b1505da7a2abca8a51a4a7aa3df6f7;hpb=174887a55ad4e8cbacde32de207c3deef8711fab;ds=sidebyside

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 972490a..9236a80 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>
@@ -38,14 +38,15 @@
 
 static void print_version(void)
 {
-	printf("pb-cui (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
+	printf("petitboot-nc (" PACKAGE_NAME ") " PACKAGE_VERSION "\n");
 }
 
 static void print_usage(void)
 {
 	print_version();
 	printf(
-"Usage: pb-cui [-h, --help] [-l, --log log-file] [-V, --version]\n");
+"Usage: petitboot-nc [-h, --help] [-l, --log log-file]\n"
+"                    [-s, --start-daemon] [-V, --version]\n");
 }
 
 /**
@@ -61,6 +62,7 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
 struct opts {
 	enum opt_value show_help;
 	const char *log_file;
+	enum opt_value start_daemon;
 	enum opt_value show_version;
 };
 
@@ -71,14 +73,15 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
 	static const struct option long_options[] = {
-		{"help",    no_argument,       NULL, 'h'},
-		{"log",     required_argument, NULL, 'l'},
-		{"version", no_argument,       NULL, 'V'},
-		{ NULL,     0,                 NULL, 0},
+		{"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[] = "hl:V";
+	static const char short_options[] = "dhl:sV";
 	static const struct opts default_values = {
-		.log_file = "pb-cui.log",
+		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
 
 	*opts = default_values;
@@ -97,6 +100,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;
@@ -120,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->kd);
-}
-
 /**
  * pb_mm_init - Setup the main menu instance.
  */
@@ -164,7 +145,8 @@ 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 ")");
 	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");
@@ -198,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);
@@ -225,9 +203,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;
+	struct opts opts;
 	FILE *log;
 
 	result = opts_parse(&opts, argc, argv);
@@ -247,15 +225,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)
+			log = fopen("/dev/null", "a");
+	}
 
-#if defined(DEBUG)
-	pb_log_always_flush(1);
-#endif
+	pb_log_init(log);
 
-	pb_log("--- pb-cui ---\n");
+	pb_log("--- petitboot-nc ---\n");
 
 	sa.sa_handler = sig_handler;
 	result = sigaction(SIGALRM, &sa, NULL);
@@ -269,13 +249,12 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	pb.cui = cui_init(&pb, pb_kexec_cb, NULL);
+	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);