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

diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c
index 972490a..6b8f5ba 100644
--- a/ui/ncurses/generic-main.c
+++ b/ui/ncurses/generic-main.c
@@ -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 [-d, --start-daemon] [-h, --help] [-l, --log log-file]\n"
+"                    [-V, --version]\n");
 }
 
 /**
@@ -59,6 +60,7 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
+	enum opt_value start_daemon;
 	enum opt_value show_help;
 	const char *log_file;
 	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},
+		{"start-daemon", no_argument,       NULL, 'd'},
+		{"help",         no_argument,       NULL, 'h'},
+		{"log",          required_argument, NULL, 'l'},
+		{"version",      no_argument,       NULL, 'V'},
+		{ NULL,          0,                 NULL, 0},
 	};
-	static const char short_options[] = "hl:V";
+	static const char short_options[] = "dhl:V";
 	static const struct opts default_values = {
-		.log_file = "pb-cui.log",
+		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
 
 	*opts = default_values;
@@ -91,6 +94,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 			break;
 
 		switch (c) {
+		case 'd':
+			opts->start_daemon = opt_yes;
+			break;
 		case 'h':
 			opts->show_help = opt_yes;
 			break;
@@ -255,7 +261,7 @@ int main(int argc, char *argv[])
 	pb_log_always_flush(1);
 #endif
 
-	pb_log("--- pb-cui ---\n");
+	pb_log("--- petitboot-nc ---\n");
 
 	sa.sa_handler = sig_handler;
 	result = sigaction(SIGALRM, &sa, NULL);
@@ -269,7 +275,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	pb.cui = cui_init(&pb, pb_kexec_cb, NULL);
+	pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon);
 
 	if (!pb.cui)
 		return EXIT_FAILURE;