configure: Cleanup dbus variables
These are realistically not configurable by the end user and could be
provided as a runtime configuration if needed so that custom networkd
binaries are not needed for each different busname.
Configure variable substitution was kept to ensure the value is
consistent between all of the source files.
Change-Id: Ic6d50a80b48e2cfc07e48067089236010894e71b
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/network_manager_main.cpp b/network_manager_main.cpp
index 3dcefe5..1b85bfa 100644
--- a/network_manager_main.cpp
+++ b/network_manager_main.cpp
@@ -26,6 +26,8 @@
constexpr char NETWORK_STATE_FILE[] = "/run/systemd/netif/state";
constexpr char NETWORK_CONF_DIR[] = "/etc/systemd/network";
+constexpr char DEFAULT_OBJPATH[] = "/xyz/openbmc_project/network";
+
namespace phosphor
{
namespace network
@@ -101,11 +103,11 @@
bus.attach_event(eventPtr.get(), SD_EVENT_PRIORITY_NORMAL);
// Add sdbusplus Object Manager for the 'root' path of the network manager.
- sdbusplus::server::manager::manager objManager(bus, OBJ_NETWORK);
- bus.request_name(BUSNAME_NETWORK);
+ sdbusplus::server::manager::manager objManager(bus, DEFAULT_OBJPATH);
+ bus.request_name(DEFAULT_BUSNAME);
phosphor::network::manager = std::make_unique<phosphor::network::Manager>(
- bus, OBJ_NETWORK, NETWORK_CONF_DIR);
+ bus, DEFAULT_OBJPATH, NETWORK_CONF_DIR);
// create the default network files if the network file
// is not there for any interface.