ui: pb_kexec_data -> pb_boot_data

[petitboot] / ui / ncurses / ps3-main.c

diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c
index 890e47b852221a0c1b04e1519e838ac5a8bbb6e9..87441456ad9ee9e25486d8ea21a43f3fdfc6628f 100644 (file)
--- a/ui/ncurses/ps3-main.c
+++ b/ui/ncurses/ps3-main.c
@@ -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);