def: lower exit-on-idle time

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

diff --git a/src/shared/def.h b/src/shared/def.h
index d7e077a577ab0dbce98b28741dd9ad70f908d59c..d196af76bd060ef21e594bdd3fbb02c26ecaee05 100644 (file)
--- 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"
 
@@ -43,3 +46,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