discover: Set UUID for network interface devices

[petitboot] / discover / network.c

diff --git a/discover/network.c b/discover/network.c
index ca4cc44acf1ba3d1334452b547326041c33f8b13..ad17a417e4f48d7fed992d48291807b71f1a1221 100644 (file)
--- a/discover/network.c
+++ b/discover/network.c
@@ -150,6 +150,25 @@ static int network_send_link_query(struct network *network)
        return 0;
 }
 
+static char *mac_bytes_to_string(void *ctx, uint8_t *addr, int len)
+{
+       const int l = strlen("xx:");
+       char *buf;
+       int i;
+
+       if (len <= 0)
+               return talloc_strdup(ctx, "");
+
+       buf = talloc_array(ctx, char, (len * l) + 1);
+
+       for (i = 0; i < len; i++)
+               sprintf(buf + (l * i), "%02x:", addr[i]);
+
+       *(buf + (l * len) - 1) = '\0';
+
+       return buf;
+}
+
 static void add_interface(struct network *network,
                struct interface *interface)
 {
@@ -157,6 +176,8 @@ static void add_interface(struct network *network,
        interface->dev = discover_device_create(network->handler,
                                        interface->name);
        interface->dev->device->type = DEVICE_TYPE_NETWORK;
+       interface->dev->uuid = mac_bytes_to_string(interface->dev,
+                       interface->hwaddr, sizeof(interface->hwaddr));
        device_handler_add_device(network->handler, interface->dev);
 }
 
@@ -181,6 +202,15 @@ static int interface_change(struct interface *interface, bool up)
                process_release(interface->udhcpc_process);
        }
 
+       if (!up) {
+               rc = process_run_simple(interface, pb_system_apps.ip,
+                               "address", "flush", "dev", interface->name,
+                               NULL);
+               if (rc)
+                       pb_log("failed to flush addresses from interface %s\n",
+                               interface->name);
+       }
+
        rc = process_run_simple(interface, pb_system_apps.ip,
                        "link", "set", interface->name, statestr, NULL);
        if (rc) {
@@ -219,7 +249,7 @@ static void configure_interface_dhcp(struct interface *interface)
        const char *argv[] = {
                pb_system_apps.udhcpc,
                "-R",
-               "-n",
+               "-f",
                "-O", "pxeconffile",
                "-O", "pxepathprefix",
                "-p", pidfile,