X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fuser-event.c;h=b3410050a8ae7b15c009b205b1773c61714ae7c4;hb=a8b4e044d505e9bdcc28ab0dfa5e3315542f0e67;hp=8cad1a91a624f5f55cd17d49858edfab3820133c;hpb=999fd1a2053421b55cdd876049c40beb2921807f;p=petitboot

diff --git a/discover/user-event.c b/discover/user-event.c
index 8cad1a9..b341005 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -58,6 +58,10 @@ static const char *event_action_name(enum event_action action)
 		return "url";
 	case EVENT_ACTION_DHCP:
 		return "dhcp";
+	case EVENT_ACTION_BOOT:
+		return "boot";
+	case EVENT_ACTION_SYNC:
+		return "sync";
 	default:
 		break;
 	}
@@ -371,42 +375,24 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
 	struct device_handler *handler = uev->handler;
 	struct discover_device *dev;
 
-	dev = discover_device_create(handler, event->device);
+	dev = discover_device_create(handler, event_get_param(event, "mac"),
+					event->device);
 
 	device_handler_dhcp(handler, dev, event);
 
 	return 0;
 }
 
-static int user_event_conf(struct user_event *uev, struct event *event)
-{
-	struct device_handler *handler = uev->handler;
-	struct discover_device *dev;
-	struct pb_url *url;
-	const char *val;
-
-	val = event_get_param(event, "url");
-	if (!val)
-		return 0;
-
-	url = pb_url_parse(event, val);
-	if (!url)
-		return 0;
-
-	dev = discover_device_create(handler, event->device);
-
-	device_handler_conf(handler, dev, url);
-
-	return 0;
-}
-
 static int user_event_add(struct user_event *uev, struct event *event)
 {
 	struct device_handler *handler = uev->handler;
 	struct discover_context *ctx;
 	struct discover_device *dev;
 
-	dev = discover_device_create(handler, event->device);
+	/* In case this is a network interface, try to refer to it by UUID */
+	dev = discover_device_create(handler, event_get_param(event, "mac"),
+					event->device);
+	dev->device->id = talloc_strdup(dev, event->device);
 	ctx = device_handler_discover_context_create(handler, dev);
 
 	parse_user_event(ctx, event);
@@ -422,8 +408,13 @@ static int user_event_remove(struct user_event *uev, struct event *event)
 {
 	struct device_handler *handler = uev->handler;
 	struct discover_device *dev;
+	const char *mac = event_get_param(event, "mac");
+
+	if (mac)
+		dev = device_lookup_by_uuid(handler, event_get_param(event, "mac"));
+	else
+		dev = device_lookup_by_id(handler, event->device);
 
-	dev = device_lookup_by_id(handler, event->device);
 	if (!dev)
 		return 0;
 
@@ -439,7 +430,37 @@ static int user_event_url(struct user_event *uev, struct event *event)
 
 	url = event_get_param(event, "url");
 	if (url)
-		device_handler_process_url(handler, url);
+		device_handler_process_url(handler, url, NULL, NULL);
+
+	return 0;
+}
+
+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);
+
+	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);
+
+	talloc_free(cmd);
+
+	return 0;
+}
+
+static int user_event_sync(struct user_event *uev, struct event *event)
+{
+	struct device_handler *handler = uev->handler;
+
+	if (strncasecmp(event->device, "all", strlen("all")) != 0)
+		device_sync_snapshots(handler, event->device);
+	else
+		device_sync_snapshots(handler, NULL);
 
 	return 0;
 }
@@ -469,19 +490,24 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
 		break;
 	case EVENT_ACTION_URL:
 		result = user_event_url(uev, event);
-		break;
-	case EVENT_ACTION_CONF:
-		result = user_event_conf(uev, event);
-		break;
+		goto out;
 	case EVENT_ACTION_DHCP:
 		result = user_event_dhcp(uev, event);
+		goto out;
+	case EVENT_ACTION_BOOT:
+		result = user_event_boot(uev, event);
+		break;
+	case EVENT_ACTION_SYNC:
+		result = user_event_sync(uev, event);
 		break;
 	default:
 		break;
 	}
 
+	/* user_event_url() and user_event_dhcp() will steal the event context,
+	 * but all others still need to free */
 	talloc_free(event);
-
+out:
 	return;
 }