ui/common: Set current console on boot command

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

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 14f36da4e9004871f7704e8f76dcaea2a3fe253b..6247dd0471b6b5fa6f8247adb68f872297eb6c52 100644 (file)
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -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__);
                rc = pb_protocol_deserialise_device(dev, message);
                if (rc) {
                        pb_log("%s: no device?\n", __func__);

-                       return 0;
+                       goto out;

                }
 
                device_add(client, dev);
                }
 
                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__);
                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);
                }
 
                boot_option_add(client, opt);


@@ -201,7 +201,7 @@ 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__);
                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;
                }
                device_remove(client, dev_id);
                break;


@@ -211,7 +211,7 @@ static int discover_client_process(void *arg)
                rc = pb_protocol_deserialise_boot_status(status, message);
                if (rc) {
                        pb_log("%s: invalid status message?\n", __func__);
                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;
                }
                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__);
                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;
                }
                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__);
                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;
                }
                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);
        }
 
                pb_log("%s: unknown action %d\n", __func__, message->action);
        }
 

+out:

        talloc_free(ctx);
 
        return 0;
        talloc_free(ctx);
 
        return 0;


@@ -311,6 +312,7 @@ 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->initrd_file = data->initrd;
        command->dtb_file = data->dtb;
        command->boot_args = data->args;

+       command->tty = ttyname(STDIN_FILENO);

 }
 
 int discover_client_boot(struct discover_client *client,
 }
 
 int discover_client_boot(struct discover_client *client,