utils/pb-console: use getty rather than exec

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 198793204ef0cd30a68bb7da80858fd3a7791cdd..ca20113a22267d8ca23b0bd25c472234bd3682b7 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -145,6 +145,24 @@ static int write_device_remove_message(struct discover_server *server,
        return client_write_message(server, client, message);
 }
 
+static int write_boot_status_message(struct discover_server *server,
+               struct client *client, const struct boot_status *status)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_boot_status_len(status);
+
+       message = pb_protocol_create_message(client,
+                       PB_PROTOCOL_ACTION_STATUS, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_boot_status(status, message->payload, len);
+
+       return client_write_message(server, client, message);
+}
+
 static int discover_server_process_message(void *arg)
 {
        struct pb_protocol_message *message;
@@ -207,9 +225,8 @@ static int discover_server_process_connection(void *arg)
                write_device_add_message(server, client, device->device);
 
                list_for_each_entry(&device->boot_options, opt, list)
-                       discover_server_notify_boot_option_add(server,
+                       write_boot_option_add_message(server, client,
                                        opt->option);
-
        }
 
        waiter_register(server->waitset, client->fd, WAIT_IN,
@@ -247,6 +264,15 @@ void discover_server_notify_device_remove(struct discover_server *server,
 
 }
 
+void discover_server_notify_boot_status(struct discover_server *server,
+               struct boot_status *status)
+{
+       struct client *client;
+
+       list_for_each_entry(&server->clients, client, list)
+               write_boot_status_message(server, client, status);
+}
+
 void discover_server_set_device_source(struct discover_server *server,
                struct device_handler *handler)
 {