diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-02-27 14:22:01 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-15 14:54:21 +0800 |
commit | 6b842bb2559116a949c6a569ac39f5c56ebc1be1 (patch) | |
tree | 6802ad3c3dc4118c37d46acf1e4d42ab3ddb3fe3 /ui/ncurses/ps3-main.c | |
parent | 6eb39a03bf66d91c37ca5d14dd61a90850a921d3 (diff) | |
download | talos-petitboot-6b842bb2559116a949c6a569ac39f5c56ebc1be1.tar.gz talos-petitboot-6b842bb2559116a949c6a569ac39f5c56ebc1be1.zip |
ui: pb_kexec_data -> pb_boot_data
find ui/ -type f |
xargs sed -i -e s/pb_kexec_data/pb_boot_data/g \
-e 's/\<kd\>/bd/g'
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui/ncurses/ps3-main.c')
-rw-r--r-- | ui/ncurses/ps3-main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c index 26d2591..8744145 100644 --- 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, ps3->cui->dry_run); + 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; |