X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fdef.h;h=92394e818317e5f9cccd28a49c7f39def47bffab;hb=e8f826f660be22540a84b0ba2947f1eedd7d61d8;hp=7777756aad457e092145be039f9a2aca151e8f5b;hpb=65b3903ff576488eaabb51d3c4fbf9c73d867d7c;p=elogind.git diff --git a/src/shared/def.h b/src/shared/def.h index 7777756aa..92394e818 100644 --- a/src/shared/def.h +++ b/src/shared/def.h @@ -61,7 +61,7 @@ "/usr/lib/kbd/keymaps/\0" #endif -#define UNIX_SYSTEM_BUS_PATH "unix:path=/run/dbus/system_bus_socket" +#define UNIX_SYSTEM_BUS_PATH "unix:path=/var/run/dbus/system_bus_socket" #define KERNEL_SYSTEM_BUS_PATH "kernel:path=/dev/kdbus/0-system/bus" #ifdef ENABLE_KDBUS @@ -71,7 +71,12 @@ #endif #define UNIX_USER_BUS_FMT "unix:path=%s/bus" -#define KERNEL_USER_BUS_FMT "kernel:path=/dev/kdbus/%lu-user/bus" +#define KERNEL_USER_BUS_FMT "kernel:path=/dev/kdbus/"UID_FMT"-user/bus" + +#define PLYMOUTH_SOCKET { \ + .un.sun_family = AF_UNIX, \ + .un.sun_path = "\0/org/freedesktop/plymouthd", \ + } #ifndef TTY_GID #define TTY_GID 5