X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fps3-main.c;h=87441456ad9ee9e25486d8ea21a43f3fdfc6628f;hp=d9a66fad74a94ca140d0a916452f5063c61ef0e5;hb=6b842bb2559116a949c6a569ac39f5c56ebc1be1;hpb=614da699a86959da0e1ba08533ab938cd224e7f8

diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c
index d9a66fa..8744145 100644
--- a/ui/ncurses/ps3-main.c
+++ b/ui/ncurses/ps3-main.c
@@ -90,7 +90,7 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 	};
 	static const char short_options[] = "hl:trV";
 	static const struct opts default_values = {
-		.log_file = "pb-cui.log",
+		.log_file = "/var/log/petitboot/petitboot-nc.log",
 	};
 
 	*opts = default_values;
@@ -294,24 +294,24 @@ static int ps3_kexec_cb(struct cui *cui, struct cui_opt_data *cod)
 
 	/* Add a default kernel video mode. */
 
-	if (!cod->kd->args) {
+	if (!cod->bd->args) {
 		altered_args = 1;
 		orig_args = NULL;
-		cod->kd->args = talloc_asprintf(NULL, "video=ps3fb:mode:%u",
+		cod->bd->args = talloc_asprintf(NULL, "video=ps3fb:mode:%u",
 			(unsigned int)ps3->values.video_mode);
-	} else if (!strstr(cod->kd->args, "video=")) {
+	} else if (!strstr(cod->bd->args, "video=")) {
 		altered_args = 1;
-		orig_args = cod->kd->args;
-		cod->kd->args = talloc_asprintf(NULL, "%s video=ps3fb:mode:%u",
+		orig_args = cod->bd->args;
+		cod->bd->args = talloc_asprintf(NULL, "%s video=ps3fb:mode:%u",
 			orig_args, (unsigned int)ps3->values.video_mode);
 	} else
 		altered_args = 0;
 
-	result = pb_run_kexec(cod->kd);
+	result = pb_run_kexec(cod->bd, ps3->cui->dry_run);
 
 	if (altered_args) {
-		talloc_free(cod->kd->args);
-		cod->kd->args = orig_args;
+		talloc_free(cod->bd->args);
+		cod->bd->args = orig_args;
 	}
 
 	return result;
@@ -597,7 +597,6 @@ int main(int argc, char *argv[])
 	int result;
 	int cui_result;
 	unsigned int mode;
-	FILE *log;
 
 	result = opts_parse(&opts, argc, argv);
 
@@ -616,9 +615,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);