commit e1e2e6dc145ec172b71f802666bff1bfb6276675
author Leonel Gonzalez <lgonzalez@us.ibm.com> Thu Mar 16 13:47:46 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 20 17:00:04 2017 +0000
tree af1cd1943faf5ddb28f243af17dd2579a4147afc
parent e2babdb30796fa23ab676eef2a4f6bdf2e043a13

Move object_mapper per dbus path conventions.

Partial fix for openbmc/openbmc#1112.

Change-Id: If4eb2036cdfc1d81578fd70ae0360cc39c7deca4
Signed-off-by: Leonel Gonzalez <lgonzalez@us.ibm.com>

fanctl/fan_control.c

diff --git a/fanctl/fan_control.c b/fanctl/fan_control.c
index 6821c17..0a93a63 100644
--- a/fanctl/fan_control.c
+++ b/fanctl/fan_control.c
@@ -24,7 +24,7 @@
 #define DBUS_MAX_NAME_LEN 256
 
 const char *objectmapper_service_name =  "xyz.openbmc_project.ObjectMapper";
-const char *objectmapper_object_name  =  "/xyz/openbmc_project/ObjectMapper";
+const char *objectmapper_object_name  =  "/xyz/openbmc_project/object_mapper";
 const char *objectmapper_intf_name    =  "xyz.openbmc_project.ObjectMapper";
 
 typedef struct {

pciedetect/pcie_slot_present_obj.c

diff --git a/pciedetect/pcie_slot_present_obj.c b/pciedetect/pcie_slot_present_obj.c
index 4946d17..01aeff4 100644
--- a/pciedetect/pcie_slot_present_obj.c
+++ b/pciedetect/pcie_slot_present_obj.c
@@ -39,7 +39,7 @@
 			G_DBUS_PROXY_FLAGS_NONE,
 			NULL, /* GDBusInterfaceInfo* */
 			"xyz.openbmc_project.ObjectMapper", /* name */
-			"/xyz/openbmc_project/ObjectMapper", /* object path */
+			"/xyz/openbmc_project/object_mapper", /* object path */
 			"xyz.openbmc_project.ObjectMapper", /* interface name */
 			NULL, /* GCancellable */
 			error);