docker: Pass extra options to configure

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 7f63d43ae331f9794d6936b75605827fe3331987..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,7 +397,9 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
 
        uint8_t hwaddr[MAC_ADDR_SIZE];
 
-       if (!event_get_param(event, "mac") || !event_get_param(event, "ip"))
+       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"),
@@ -398,8 +407,12 @@ static int user_event_dhcp(struct user_event *uev, struct event *event)
               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);