discover/user-event: Use bootfile_url if available

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 77d28c116e635fb74698e49f0c59dfb1cb193335..128186beb0468be9f17c321e4d61199ac1746693 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -251,13 +251,14 @@ static char *parse_ip_addr(struct discover_context *ctx, const char *ip)
 struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
                struct event *event, bool *is_complete)
 {
-       const char *conffile, *pathprefix, *host, *bootfile;
+       const char *conffile, *pathprefix, *host, *bootfile, *bootfile_url;
        char *p, *basedir, *url_str;
        struct pb_url *url;
 
        conffile = event_get_param(event, "pxeconffile");
        pathprefix = event_get_param(event, "pxepathprefix");
        bootfile = event_get_param(event, "bootfile");
+       bootfile_url = event_get_param(event, "bootfile_url");
 
        /* If we're given a conf file, we're able to generate a complete URL to
         * the configuration file, and the parser doesn't need to do any
@@ -288,6 +289,12 @@ 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__);
+
+               /* No full URLs and no host address? Check for DHCPv6 options */
+               if (bootfile_url && is_url(bootfile_url)) {
+                       *is_complete = true;
+                       return pb_url_parse(ctx, bootfile_url);
+               }
                return NULL;
        }
 
@@ -390,13 +397,22 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
 
        uint8_t hwaddr[MAC_ADDR_SIZE];
 
+       if (!event_get_param(event, "mac"))
+               return -1;
+       if (!event_get_param(event, "ip") && !event_get_param(event, "ipv6"))
+               return -1;
+
        sscanf(event_get_param(event, "mac"),
               "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX",
               hwaddr, hwaddr + 1, hwaddr + 2,
               hwaddr + 3, hwaddr + 4, hwaddr + 5);
 
-       system_info_set_interface_address(sizeof(hwaddr), hwaddr,
-                                         event_get_param(event, "ip"));
+       if (event_get_param(event, "ipv6"))
+               system_info_set_interface_address(sizeof(hwaddr), hwaddr,
+                                                 event_get_param(event, "ipv6"));
+       else
+               system_info_set_interface_address(sizeof(hwaddr), hwaddr,
+                                                 event_get_param(event, "ip"));
 
        dev = discover_device_create(handler, event_get_param(event, "mac"),
                                        event->device);
@@ -411,6 +427,7 @@ 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;
+       int rc;
 
        /* In case this is a network interface, try to refer to it by UUID */
        dev = discover_device_create(handler, event_get_param(event, "mac"),
@@ -418,7 +435,11 @@ static int user_event_add(struct user_event *uev, struct event *event)
        dev->device->id = talloc_strdup(dev, event->device);
        ctx = device_handler_discover_context_create(handler, dev);
 
-       parse_user_event(ctx, event);
+       rc = parse_user_event(ctx, event);
+       if (rc) {
+               pb_log("parse_user_event returned %d\n", rc);
+               return rc;
+       }
 
        device_handler_discover_context_commit(handler, ctx);