chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support negated fstab options
[elogind.git]
/
src
/
shared
/
def.h
diff --git
a/src/shared/def.h
b/src/shared/def.h
index 98e3e10fb6fd472d9657d66c4f428fc181d14264..96c45a6b723dededf0c59e0b08778d124fd04779 100644
(file)
--- a/
src/shared/def.h
+++ b/
src/shared/def.h
@@
-61,17
+61,17
@@
"/usr/lib/kbd/keymaps/\0"
#endif
"/usr/lib/kbd/keymaps/\0"
#endif
-#define UNIX_SYSTEM_BUS_
PATH
"unix:path=/var/run/dbus/system_bus_socket"
-#define KERNEL_SYSTEM_BUS_
PATH
"kernel:path=/sys/fs/kdbus/0-system/bus"
+#define UNIX_SYSTEM_BUS_
ADDRESS
"unix:path=/var/run/dbus/system_bus_socket"
+#define KERNEL_SYSTEM_BUS_
ADDRESS
"kernel:path=/sys/fs/kdbus/0-system/bus"
#ifdef ENABLE_KDBUS
#ifdef ENABLE_KDBUS
-# define DEFAULT_SYSTEM_BUS_
PATH KERNEL_SYSTEM_BUS_PATH ";" UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_
ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
#else
#else
-# define DEFAULT_SYSTEM_BUS_
PATH UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_
ADDRESS UNIX_SYSTEM_BUS_ADDRESS
#endif
#endif
-#define UNIX_USER_BUS_FMT "unix:path=%s/bus"
-#define KERNEL_USER_BUS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
+#define UNIX_USER_BUS_
ADDRESS_
FMT "unix:path=%s/bus"
+#define KERNEL_USER_BUS_
ADDRESS_
FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"-user/bus"
#define PLYMOUTH_SOCKET { \
.un.sun_family = AF_UNIX, \
#define PLYMOUTH_SOCKET { \
.un.sun_family = AF_UNIX, \