discover/network: Search by UUID only if available

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index 51a846af8a0c6ae8e75582f1eea619a75e8c1eb7..c3cf30ac973b54f875d56356fc58910190240e0d 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -242,7 +242,10 @@ void network_register_device(struct network *network,
 {
        struct interface *iface;
 
-       iface = find_interface_by_uuid(network, dev->uuid);
+       if (dev->uuid)
+               iface = find_interface_by_uuid(network, dev->uuid);
+       else
+               iface = find_interface_by_name(network, dev->label);
        if (!iface)
                return;
 
@@ -384,6 +387,10 @@ static void configure_interface_static(struct network *network,
                return;
        }
 
+       system_info_set_interface_address(sizeof(interface->hwaddr),
+                               interface->hwaddr,
+                               config->static_config.address);
+
        /* we need the interface up before we can route through it */
        rc = interface_up(interface);
        if (rc)