ui/ncurses: Increase height of boot-editor pad

[petitboot] / ui / common / discover-client.c

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 14f36da4e9004871f7704e8f76dcaea2a3fe253b..dce74f9080b527a23afc7acd73dcf7b971e04faa 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -131,7 +131,7 @@ void discover_client_enumerate(struct discover_client *client)
 }
 
 static void update_status(struct discover_client *client,
-               struct boot_status *status)
+               struct status *status)
 {
        if (client->ops.update_status)
                client->ops.update_status(status, client->ops.cb_arg);
@@ -156,8 +156,8 @@ static int discover_client_process(void *arg)
        struct discover_client *client = arg;
        struct pb_protocol_message *message;
        struct system_info *sysinfo;
-       struct boot_status *status;
        struct boot_option *opt;
+       struct status *status;
        struct config *config;
        struct device *dev;
        char *dev_id;
@@ -181,7 +181,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_device(dev, message);
                if (rc) {
                        pb_log("%s: no device?\n", __func__);
-                       return 0;
+                       goto out;
                }
 
                device_add(client, dev);
@@ -192,7 +192,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_boot_option(opt, message);
                if (rc) {
                        pb_log("%s: no boot_option?\n", __func__);
-                       return 0;
+                       goto out;
                }
 
                boot_option_add(client, opt);
@@ -201,17 +201,17 @@ static int discover_client_process(void *arg)
                dev_id = pb_protocol_deserialise_string(ctx, message);
                if (!dev_id) {
                        pb_log("%s: no device id?\n", __func__);
-                       return 0;
+                       goto out;
                }
                device_remove(client, dev_id);
                break;
        case PB_PROTOCOL_ACTION_STATUS:
-               status = talloc_zero(ctx, struct boot_status);
+               status = talloc_zero(ctx, struct status);
 
                rc = pb_protocol_deserialise_boot_status(status, message);
                if (rc) {
                        pb_log("%s: invalid status message?\n", __func__);
-                       return 0;
+                       goto out;
                }
                update_status(client, status);
                break;
@@ -221,7 +221,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_system_info(sysinfo, message);
                if (rc) {
                        pb_log("%s: invalid sysinfo message?\n", __func__);
-                       return 0;
+                       goto out;
                }
                update_sysinfo(client, sysinfo);
                break;
@@ -231,7 +231,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_config(config, message);
                if (rc) {
                        pb_log("%s: invalid config message?\n", __func__);
-                       return 0;
+                       goto out;
                }
                update_config(client, config);
                break;
@@ -239,6 +239,7 @@ static int discover_client_process(void *arg)
                pb_log("%s: unknown action %d\n", __func__, message->action);
        }
 
+out:
        talloc_free(ctx);
 
        return 0;
@@ -311,6 +312,8 @@ static void create_boot_command(struct boot_command *command,
        command->initrd_file = data->initrd;
        command->dtb_file = data->dtb;
        command->boot_args = data->args;
+       command->args_sig_file = data->args_sig_file;
+       command->console = ttyname(STDIN_FILENO);
 }
 
 int discover_client_boot(struct discover_client *client,