From: Tom Gundersen <teg@jklm.no>
Date: Thu, 22 Jan 2015 20:18:30 +0000 (+0100)
Subject: dhcp-identifier: create IAID even if no udev device can be found
X-Git-Tag: v219~339
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=40862866417265ac8c20422cb44f14a8f141ce0d

dhcp-identifier: create IAID even if no udev device can be found

This is useful for testing.
---

diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index 5386dca9e..e4b0ce6b2 100644
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -78,14 +78,13 @@ int dhcp_identifier_set_iaid(int ifindex, uint8_t *mac, size_t mac_len, uint32_t
 
                 sprintf(ifindex_str, "n%d", ifindex);
                 device = udev_device_new_from_device_id(udev, ifindex_str);
-                if (!device)
-                        return -errno;
+                if (device) {
+                        if (udev_device_get_is_initialized(device) <= 0)
+                                /* not yet ready */
+                                return -EBUSY;
 
-                if (udev_device_get_is_initialized(device) <= 0)
-                        /* not yet ready */
-                        return -EBUSY;
-
-                name = net_get_name(device);
+                        name = net_get_name(device);
+                }
         }
 
         if (name)