sd-daemon: Add sd_is_special for special file descriptors

[elogind.git] / src / initctl.c

diff --git a/src/initctl.c b/src/initctl.c
index 53eac575409298293a702648ae16afbe88888e12..dd743142fd10dff952f8d20c5854eca26838f412 100644 (file)
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -42,9 +42,10 @@
 #include "special.h"
 #include "sd-daemon.h"
 #include "dbus-common.h"
+#include "def.h"
 
 #define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (10*MSEC_PER_SEC))
+#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
 
 typedef struct Fifo Fifo;
 
@@ -119,7 +120,7 @@ static void change_runlevel(Server *s, int runlevel) {
         else
                 mode = "replace";
 
-        log_debug("Running request %s", target);
+        log_debug("Running request %s/start/%s", target, mode);
 
         if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) {
                 log_error("Could not allocate message.");
@@ -388,7 +389,7 @@ int main(int argc, char *argv[]) {
 
                 if ((k = epoll_wait(server.epoll_fd,
                                     &event, 1,
-                                    TIMEOUT)) < 0) {
+                                    TIMEOUT_MSEC)) < 0) {
 
                         if (errno == EINTR)
                                 continue;