Change-Id: I9608d089019ce58208b8e1ead304ae353ebd31c0
extern "C" {
#endif
-#define SYSTEM_BUS_CONF_FILE "/etc/dbus-1/system.conf"
-#define SESSION_BUS_CONF_FILE "/etc/dbus-1/session.conf"
+#define SYSTEM_BUS_CONF_FILE_PRIMARY "/usr/share/dbus-1/system.conf"
+#define SESSION_BUS_CONF_FILE_PRIMARY "/usr/share/dbus-1/session.conf"
+
+#define SYSTEM_BUS_CONF_FILE_SECONDARY "/etc/dbus-1/system.conf"
+#define SESSION_BUS_CONF_FILE_SECONDARY "/etc/dbus-1/session.conf"
#define SYSTEM_BUS 1
#define SESSION_BUS 2
return NULL;
}
- r = __internal_init(bus_type, (bus_type == SYSTEM_BUS) ? SYSTEM_BUS_CONF_FILE : SESSION_BUS_CONF_FILE);
+ r = __internal_init(bus_type, (bus_type == SYSTEM_BUS) ? SYSTEM_BUS_CONF_FILE_PRIMARY : SESSION_BUS_CONF_FILE_PRIMARY);
+ if(r < 0) {
+ printf("Failed to parse primary config file, trying secondary config...\n");
+ r = __internal_init(bus_type, (bus_type == SYSTEM_BUS) ? SYSTEM_BUS_CONF_FILE_SECONDARY : SESSION_BUS_CONF_FILE_SECONDARY);
+ }
if(r >= 0) {
p_udesc = (struct udesc*)malloc(sizeof(struct udesc));
if(p_udesc) {