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

diff --git a/discover/user-event.c b/discover/user-event.c
index 1257796..cc03ffd 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);
 
@@ -639,10 +657,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
 		break;
 	case EVENT_ACTION_URL:
 		result = user_event_url(uev, event);
-		goto out;
+		break;
 	case EVENT_ACTION_DHCP:
 		result = user_event_dhcp(uev, event);
-		goto out;
+		break;
 	case EVENT_ACTION_BOOT:
 		result = user_event_boot(uev, event);
 		break;
@@ -653,13 +671,17 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
 		result = user_event_plugin(uev, event);
 		break;
 	default:
+		result = -1;
 		break;
 	}
 
+	if (result)
+		pb_log_fn("failed to handle action %d\n", event->action);
+
 	/* user_event_url() and user_event_dhcp() will steal the event context,
 	 * but all others still need to free */
-	talloc_free(event);
-out:
+	if (talloc_parent(event) == uev)
+		talloc_free(event);
 	return;
 }
 
@@ -732,6 +754,13 @@ struct user_event *user_event_init(struct device_handler *handler,
 			strerror(errno));
 	}
 
+	/* Don't allow events from non-priviledged users */
+	if (chown(PBOOT_USER_EVENT_SOCKET, 0, 0))
+		pb_log_fn("Error setting socket ownership: %m\n");
+	errno = 0;
+	if (chmod(PBOOT_USER_EVENT_SOCKET, 0660))
+		pb_log_fn("Error setting socket permissions: %m\n");
+
 	waiter_register_io(waitset, uev->socket, WAIT_IN,
 			user_event_process, uev);