diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-02-27 14:28:55 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-04-15 14:54:21 +0800 |
commit | 1b0b59295d0500764c5096753f7cd11bf3ab5df4 (patch) | |
tree | ec9212781e9e7acf57b399ab7ed13d27244b0012 /ui/ncurses/ps3-main.c | |
parent | 6b842bb2559116a949c6a569ac39f5c56ebc1be1 (diff) | |
download | talos-petitboot-1b0b59295d0500764c5096753f7cd11bf3ab5df4.tar.gz talos-petitboot-1b0b59295d0500764c5096753f7cd11bf3ab5df4.zip |
ui: callback & boot actions: kexec -> boot
find ui/ -type f |
xargs sed -i -e s/kexec_cb/boot_cb/g \
-e s/on_kexec/on_boot/g \
-e s/run_kexec/boot/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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c index 8744145..3b9fab1 100644 --- a/ui/ncurses/ps3-main.c +++ b/ui/ncurses/ps3-main.c @@ -267,13 +267,13 @@ static int ps3_svm_cb(struct pmenu_item *item) } /** - * ps3_kexec_cb - The kexec callback. + * ps3_boot_cb - The kexec callback. * - * Writes config data to PS3 flash then calls pb_run_kexec(). + * Writes config data to PS3 flash then calls pb_boot(). * Adds a video mode arg to the kernel command line if needed. */ -static int ps3_kexec_cb(struct cui *cui, struct cui_opt_data *cod) +static int ps3_boot_cb(struct cui *cui, struct cui_opt_data *cod) { struct ps3_cui *ps3 = ps3_from_cui(cui); int result; @@ -307,7 +307,7 @@ static int ps3_kexec_cb(struct cui *cui, struct cui_opt_data *cod) } else altered_args = 0; - result = pb_run_kexec(cod->bd, ps3->cui->dry_run); + result = pb_boot(cod->bd, ps3->cui->dry_run); if (altered_args) { talloc_free(cod->bd->args); @@ -658,7 +658,7 @@ int main(int argc, char *argv[]) if (!result && (ps3.values.video_mode != (uint16_t)mode)) ps3_set_video_mode(ps3.values.video_mode); - ps3.cui = cui_init(&ps3, ps3_kexec_cb, ps3_sixaxis_map); + ps3.cui = cui_init(&ps3, ps3_boot_cb, ps3_sixaxis_map); if (!ps3.cui) return EXIT_FAILURE; |