ethernet_interface: Fix nicEnabled property ordering
This should have been set prior to writing the configuration file,
otherwise the incorrect value gets written and the interface doesn't get
updated.
Change-Id: I970495ad8817f406252afccc1bb4291193d4bf61
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index 3cca478..40f3511 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -784,19 +784,18 @@
{
return EthernetInterfaceIntf::nicEnabled();
}
- auto ifname = interfaceName();
+ EthernetInterfaceIntf::nicEnabled(value);
writeConfigurationFile();
if (!value)
{
// We only need to bring down the interface, networkd will always bring
// up managed interfaces
manager.addReloadPreHook(
- [ifname = std::move(ifname), eifSocket = std::move(eifSocket)]() {
+ [ifname = interfaceName(), eifSocket = std::move(eifSocket)]() {
setNICAdminState(eifSocket.sock, ifname.c_str(), false);
});
}
- EthernetInterfaceIntf::nicEnabled(value);
manager.reloadConfigs();
return value;