X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fdef.h;h=92394e818317e5f9cccd28a49c7f39def47bffab;hb=c73d180dc4bbd87c945a524b42b672af2ffe2609;hp=d7e077a577ab0dbce98b28741dd9ad70f908d59c;hpb=3f41e1e5955552a771748225334b3e8a7eb02b8a;p=elogind.git

diff --git a/src/shared/def.h b/src/shared/def.h
index d7e077a57..92394e818 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -30,7 +30,10 @@
 #define DEFAULT_START_LIMIT_INTERVAL (10*USEC_PER_SEC)
 #define DEFAULT_START_LIMIT_BURST 5
 
-#define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE)
+/* The default time after which exit-on-idle services exit. This
+ * should be kept lower than the watchdog timeout, because otherwise
+ * the watchdog pings will keep the loop busy. */
+#define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
 
 #define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
 
@@ -41,5 +44,40 @@
 #define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz"
 #define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS
+#define ALPHANUMERICAL LETTERS DIGITS
 
 #define REBOOT_PARAM_FILE "/run/systemd/reboot-param"
+
+#ifdef HAVE_SPLIT_USR
+#define KBD_KEYMAP_DIRS                         \
+        "/usr/share/keymaps/\0"                 \
+        "/usr/share/kbd/keymaps/\0"             \
+        "/usr/lib/kbd/keymaps/\0"               \
+        "/lib/kbd/keymaps/\0"
+#else
+#define KBD_KEYMAP_DIRS                         \
+        "/usr/share/keymaps/\0"                 \
+        "/usr/share/kbd/keymaps/\0"             \
+        "/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=/dev/kdbus/0-system/bus"
+
+#ifdef ENABLE_KDBUS
+#  define DEFAULT_SYSTEM_BUS_PATH KERNEL_SYSTEM_BUS_PATH ";" UNIX_SYSTEM_BUS_PATH
+#else
+#  define DEFAULT_SYSTEM_BUS_PATH UNIX_SYSTEM_BUS_PATH
+#endif
+
+#define UNIX_USER_BUS_FMT "unix:path=%s/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
+#endif