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

diff --git a/discover/user-event.c b/discover/user-event.c
index b201de8..b341005 100644
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -375,7 +375,8 @@ 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);
 
@@ -388,7 +389,10 @@ static int user_event_add(struct user_event *uev, struct event *event)
 	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);
@@ -404,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;