ui/ncurses: in lockdown ensure system reboot in ncurses menu exit

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 128186beb0468be9f17c321e4d61199ac1746693..734f77b3014a6905635b73e110dd2e38706e3a28 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -94,13 +94,13 @@ static struct resource *user_event_resource(struct discover_boot_option *opt,
 
        siaddr = event_get_param(event, "siaddr");
        if (!siaddr) {
-               pb_log("%s: next server option not found\n", __func__);
+               pb_log_fn("next server option not found\n");
                return NULL;
        }
 
        boot_file = event_get_param(event, "bootfile");
        if (!boot_file) {
-               pb_log("%s: bootfile not found\n", __func__);
+               pb_log_fn("bootfile not found\n");
                return NULL;
        }
 
@@ -148,7 +148,7 @@ static int parse_user_event(struct discover_context *ctx, struct event *event)
        val = event_get_param(event, "name");
 
        if (!val) {
-               pb_log("%s: no name found\n", __func__);
+               pb_log_fn("no name found\n");
                goto fail_opt;
        }
 
@@ -157,7 +157,7 @@ static int parse_user_event(struct discover_context *ctx, struct event *event)
 
        d_opt->boot_image = user_event_resource(d_opt, event, false);
        if (!d_opt->boot_image) {
-               pb_log("%s: no boot image found for %s!\n", __func__,
+               pb_log_fn("no boot image found for %s!\n",
                                opt->name);
                goto fail_opt;
        }
@@ -288,7 +288,7 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
 
        host = parse_host_addr(event);
        if (!host) {
-               pb_log("%s: host address not found\n", __func__);
+               pb_log_fn("host address not found\n");
 
                /* No full URLs and no host address? Check for DHCPv6 options */
                if (bootfile_url && is_url(bootfile_url)) {
@@ -362,7 +362,7 @@ char **user_event_parse_conf_filenames(
        }
 
        if (!mac_addr && !ip_hex) {
-               pb_log("%s: neither mac nor ip parameter found\n", __func__);
+               pb_log_fn("neither mac nor ip parameter found\n");
                return NULL;
        }
 
@@ -482,13 +482,30 @@ static int user_event_url(struct user_event *uev, struct event *event)
 static int user_event_boot(struct user_event *uev, struct event *event)
 {
        struct device_handler *handler = uev->handler;
-       struct boot_command *cmd = talloc(handler, struct boot_command);
+       struct boot_command *cmd = talloc_zero(handler, struct boot_command);
+       struct discover_boot_option *opt;
+       const char *name;
+
+       name = event_get_param(event, "name");
+       if (name) {
+               pb_log("Finding boot option %s @ %s\n", name, event->device);
+               opt = device_handler_find_option_by_name(handler,
+                               event->device, name);
+               if (!opt) {
+                       pb_log("No option with name %s\n", name);
+                       return -1;
+               }
 
-       cmd->option_id = talloc_strdup(cmd, event_get_param(event, "id"));
-       cmd->boot_image_file = talloc_strdup(cmd, event_get_param(event, "image"));
-       cmd->initrd_file = talloc_strdup(cmd, event_get_param(event, "initrd"));
-       cmd->dtb_file = talloc_strdup(cmd, event_get_param(event, "dtb"));
-       cmd->boot_args = talloc_strdup(cmd, event_get_param(event, "args"));
+               pb_log("Found option with id %s!\n", opt->option->id);
+               cmd->option_id = talloc_strdup(cmd, opt->option->id);
+       } else {
+               pb_log("Booting based on full boot command\n");
+               cmd->option_id = talloc_strdup(cmd, event_get_param(event, "id"));
+               cmd->boot_image_file = talloc_strdup(cmd, event_get_param(event, "image"));
+               cmd->initrd_file = talloc_strdup(cmd, event_get_param(event, "initrd"));
+               cmd->dtb_file = talloc_strdup(cmd, event_get_param(event, "dtb"));
+               cmd->boot_args = talloc_strdup(cmd, event_get_param(event, "args"));
+       }
 
        device_handler_boot(handler, cmd);
 
@@ -672,12 +689,12 @@ static int user_event_process(void *arg)
        len = recvfrom(uev->socket, buf, PBOOT_USER_EVENT_SIZE, 0, NULL, NULL);
 
        if (len < 0) {
-               pb_log("%s: socket read failed: %s", __func__, strerror(errno));
+               pb_log_fn("socket read failed: %s\n", strerror(errno));
                return 0;
        }
 
        if (len == 0) {
-               pb_log("%s: empty", __func__);
+               pb_log_fn("empty\n");
                return 0;
        }