fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-01 20:48:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.4'

Browse source
This commit is contained in:
Lennart Poettering 2011-07-28 21:26:21 +02:00
commit 3e2519b49a
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bus/config-parser.c
View file

@ -3395,6 +3395,10 @@ static const char *test_system_service_dir_matches[] =
"/testusr/testshare/dbus-1/system-services",
#endif
DBUS_DATADIR"/dbus-1/system-services",
#ifdef DBUS_UNIX
"/lib/dbus-1/system-services",
#endif
#ifdef DBUS_WIN
NULL,
#endif

16
dbus/dbus-sysdeps-unix.c
View file

@ -3626,12 +3626,18 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs)
}
/*
* add configured datadir to defaults
* this may be the same as an xdg dir
* however the config parser should take
* care of duplicates
* Add configured datadir to defaults. This may be the same as one
* of the XDG directories. However, the config parser should take
* care of the duplicates.
*
* Also, append /lib as counterpart of /usr/share on the root
* directory (the root directory does not know /share), in order to
* facilitate early boot system bus activation where /usr might not
* be available.
*/
if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR":"))
if (!_dbus_string_append (&servicedir_path,
DBUS_DATADIR":"
"/lib:"))
goto oom;
if (!_dbus_split_paths_and_append (&servicedir_path,