bus: when connecting to a container's kdbus instance, enter namespace first

[elogind.git] / src / shared / def.h

diff --git a/src/shared/def.h b/src/shared/def.h
index 46b88a8a49e3040d24455fd5c183f35a1f29ab13..825db9507f7ff35bbc35d6f34b2bd5ddca88888c 100644 (file)
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -27,6 +27,9 @@
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 #define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)
 
+#define DEFAULT_START_LIMIT_INTERVAL (10*USEC_PER_SEC)
+#define DEFAULT_START_LIMIT_BURST 5
+
 #define DEFAULT_EXIT_USEC (5*USEC_PER_MINUTE)
 
 #define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
@@ -40,3 +43,16 @@
 #define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS
 
 #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