summaryrefslogtreecommitdiffstats
path: root/ui/common
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-02-27 14:22:01 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-04-15 14:54:21 +0800
commit6b842bb2559116a949c6a569ac39f5c56ebc1be1 (patch)
tree6802ad3c3dc4118c37d46acf1e4d42ab3ddb3fe3 /ui/common
parent6eb39a03bf66d91c37ca5d14dd61a90850a921d3 (diff)
downloadtalos-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/common')
-rw-r--r--ui/common/ui-system.c18
-rw-r--r--ui/common/ui-system.h6
2 files changed, 12 insertions, 12 deletions
diff --git a/ui/common/ui-system.c b/ui/common/ui-system.c
index b4ae8f8..a828e2e 100644
--- a/ui/common/ui-system.c
+++ b/ui/common/ui-system.c
@@ -145,7 +145,7 @@ static int kexec_reboot(int dry_run)
* pb_run_kexec - Run kexec with the supplied boot options.
*/
-int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
+int pb_run_kexec(const struct pb_boot_data *bd, int dry_run)
{
int result;
char *l_image = NULL;
@@ -153,20 +153,20 @@ int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
unsigned int clean_image = 0;
unsigned int clean_initrd = 0;
- pb_log("%s: image: '%s'\n", __func__, kd->image);
- pb_log("%s: initrd: '%s'\n", __func__, kd->initrd);
- pb_log("%s: args: '%s'\n", __func__, kd->args);
+ pb_log("%s: image: '%s'\n", __func__, bd->image);
+ pb_log("%s: initrd: '%s'\n", __func__, bd->initrd);
+ pb_log("%s: args: '%s'\n", __func__, bd->args);
result = -1;
- if (kd->image) {
- l_image = pb_load_file(NULL, kd->image, &clean_image);
+ if (bd->image) {
+ l_image = pb_load_file(NULL, bd->image, &clean_image);
if (!l_image)
goto no_load;
}
- if (kd->initrd) {
- l_initrd = pb_load_file(NULL, kd->initrd, &clean_initrd);
+ if (bd->initrd) {
+ l_initrd = pb_load_file(NULL, bd->initrd, &clean_initrd);
if (!l_initrd)
goto no_load;
}
@@ -174,7 +174,7 @@ int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run)
if (!l_image && !l_initrd)
goto no_load;
- result = kexec_load(l_image, l_initrd, kd->args, dry_run);
+ result = kexec_load(l_image, l_initrd, bd->args, dry_run);
no_load:
if (clean_image)
diff --git a/ui/common/ui-system.h b/ui/common/ui-system.h
index b75c4d1..82f630e 100644
--- a/ui/common/ui-system.h
+++ b/ui/common/ui-system.h
@@ -27,13 +27,13 @@
#include <signal.h>
-struct pb_kexec_data {
+struct pb_boot_data {
char *image;
char *initrd;
char *args;
};
-int pb_run_kexec(const struct pb_kexec_data *kd, int dry_run);
+int pb_run_kexec(const struct pb_boot_data *bd, int dry_run);
int pb_start_daemon(void);
unsigned int pb_elf_hash(const char *str);
@@ -47,7 +47,7 @@ static inline uint32_t pb_opt_hash(const struct device *dev,
struct pb_opt_data {
const char *name;
- struct pb_kexec_data *kd;
+ struct pb_boot_data *bd;
/* optional data */
const struct device *dev;
OpenPOWER on IntegriCloud