X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fuser-event.c;h=d3d4a5e8ad8962e35f0c29ebc75877e79e173146;hp=1257796494e5211f01d210a11565c9539a6bffca;hb=89cde533356d47b34a80679602c3900572b2dca6;hpb=c78f9ec47ba92b74698dacdae963dbbefd9b676f

diff --git a/discover/user-event.c b/discover/user-event.c
index 1257796..d3d4a5e 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 
@@ -482,15 +483,32 @@ 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);
+	device_handler_boot(handler, false, cmd);
 
 	talloc_free(cmd);
 
@@ -732,6 +750,10 @@ struct user_event *user_event_init(struct device_handler *handler,
 			strerror(errno));
 	}
 
+	/* Don't allow events from non-priviledged users */
+	chown(PBOOT_USER_EVENT_SOCKET, 0, 0);
+	chmod(PBOOT_USER_EVENT_SOCKET, 0660);
+
 	waiter_register_io(waitset, uev->socket, WAIT_IN,
 			user_event_process, uev);