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>

2 files changed, 7 insertions, 7 deletions

diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c
index 8ed46b7..28a96e4 100644
--- a/ui/twin/main-generic.c
+++ b/ui/twin/main-generic.c
@@ -207,7 +207,7 @@ static int kexec_cb(struct pbt_client *client, struct pb_opt_data *opt_data)
 
 	pb_log("%s: %s\n", __func__, opt_data->name);
 
-	result = pb_run_kexec(opt_data->kd, client->dry_run);
+	result = pb_run_kexec(opt_data->bd, client->dry_run);
 
 	return result;
 }
diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index 8eba0a2..39facf5 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -69,10 +69,10 @@ static int pbt_client_run_kexec(struct pbt_item *item)
 		sleep(item->pbt_client->dry_run ? 1 : 60);
 	}
 
-	pb_log("%s: failed: %s\n", __func__, opt_data->kd->image);
+	pb_log("%s: failed: %s\n", __func__, opt_data->bd->image);
 
 	pbt_frame_status_printf(&item->pbt_client->frame, "Failed: kexec %s",
-		opt_data->kd->image);
+		opt_data->bd->image);
 
 	return 0;
 }
@@ -145,12 +145,12 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client)
 
 		i->data = opt_data = talloc(i, struct pb_opt_data);
 		opt_data->name = opt->name;
-		opt_data->kd = talloc(i, struct pb_kexec_data);
-		opt_data->kd->image = talloc_strdup(opt_data->kd,
+		opt_data->bd = talloc(i, struct pb_boot_data);
+		opt_data->bd->image = talloc_strdup(opt_data->bd,
 			opt->boot_image_file);
-		opt_data->kd->initrd = talloc_strdup(opt_data->kd,
+		opt_data->bd->initrd = talloc_strdup(opt_data->bd,
 			opt->initrd_file);
-		opt_data->kd->args = talloc_strdup(opt_data->kd,
+		opt_data->bd->args = talloc_strdup(opt_data->bd,
 			opt->boot_args);
 		opt_data->dev = dev;
 		opt_data->opt = opt;