diff options
author | William A. Kennington III <wak@google.com> | 2019-02-12 19:58:11 -0800 |
---|---|---|
committer | William A. Kennington III <wak@google.com> | 2019-03-12 12:51:58 -0700 |
commit | f1aa51cedf4618d084ef9edd613d5f886fc8b73c (patch) | |
tree | 3dfa8798007bb3efbe52da6cd25b9517d8a8bff4 | |
parent | 5f1eb46840818b0b9545ddd2ebd5ac709bb9d57a (diff) | |
download | phosphor-networkd-f1aa51cedf4618d084ef9edd613d5f886fc8b73c.tar.gz phosphor-networkd-f1aa51cedf4618d084ef9edd613d5f886fc8b73c.zip |
configure: Remove systemd dbus paths
Nothing but our code references these variable so lets just define them
where they are needed instead of having the configure script populate
them.
Change-Id: Ibd08d0698488febf5ea1cc8d6c14379ea6a50051
Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | network_manager.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index a6cdc3d..7035723 100644 --- a/configure.ac +++ b/configure.ac @@ -112,10 +112,6 @@ AC_SUBST(DEFAULT_BUSNAME, ["$DEFAULT_BUSNAME"]) AC_ARG_VAR(SYSTEMD_TARGET, "Target for starting this service") AS_IF([test "x$SYSTEMD_TARGET" == "x"], [SYSTEMD_TARGET="multi-user.target"]) -AC_DEFINE(SYSTEMD_BUSNAME, "org.freedesktop.systemd1", [systemd busname.]) -AC_DEFINE(SYSTEMD_PATH, "/org/freedesktop/systemd1", [systemd path.]) -AC_DEFINE(SYSTEMD_INTERFACE, "org.freedesktop.systemd1.Manager", [systemd interface.]) - # Create configured output. AC_CONFIG_FILES([Makefile test/Makefile]) AC_CONFIG_FILES([xyz.openbmc_project.Network.service]) diff --git a/network_manager.cpp b/network_manager.cpp index c4ab0da..4483631 100644 --- a/network_manager.cpp +++ b/network_manager.cpp @@ -20,6 +20,10 @@ #include <string> #include <xyz/openbmc_project/Common/error.hpp> +constexpr char SYSTEMD_BUSNAME[] = "org.freedesktop.systemd1"; +constexpr char SYSTEMD_PATH[] = "/org/freedesktop/systemd1"; +constexpr char SYSTEMD_INTERFACE[] = "org.freedesktop.systemd1.Manager"; + namespace phosphor { namespace network |