commit fad525c0fcb4595d515ca32e8a2553caf95083b4
author William A. Kennington III <wak@google.com> Wed Apr 17 00:51:59 2024 -0700
committer William A. Kennington III <wak@google.com> Wed Apr 17 02:16:07 2024 -0700
tree 93097c64f3741052d15c659a96ba40050f8c3a4a
parent 44937b1adbe49f0876492f566b3cc7e0c71ea4ad

ethernet_interface: Emit DHCP objects after parent

We don't want the DHCP objects to get emitted onto the bus if the parent
hasn't been submitted yet, change the ordering to make more sense.

Change-Id: Ib97b2a82586a41eb5bc2cfe421864b2cb729c0e2
Signed-off-by: William A. Kennington III <wak@google.com>

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index f49cb24..4b50894 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -118,8 +118,6 @@
     {
         EthernetInterface::defaultGateway6(stdplus::toStr(*info.defgw6), true);
     }
-    dhcp4Conf.emplace(bus, this->objPath + "/dhcp4", *this, DHCPType::v4);
-    dhcp6Conf.emplace(bus, this->objPath + "/dhcp6", *this, DHCPType::v6);
     emit_object_added();
 
     if (info.intf.vlan_id)
@@ -130,6 +128,8 @@
         }
         vlan.emplace(bus, this->objPath.c_str(), info.intf, *this);
     }
+    dhcp4Conf.emplace(bus, this->objPath + "/dhcp4", *this, DHCPType::v4);
+    dhcp6Conf.emplace(bus, this->objPath + "/dhcp6", *this, DHCPType::v6);
     for (const auto& [_, addr] : info.addrs)
     {
         addAddr(addr);