X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=45f5f70b2acd8caed560f786ce89473903996a5c;hp=9f615e64ebf81098a26c67156a62641c2ee74cdb;hb=75cb8502dfec0a6a5305fe766d4b6a1a04a43549;hpb=d450b6f2a9dd8a7fb14e9f8f771ddd70de7afc5e

diff --git a/src/core/manager.c b/src/core/manager.c
index 9f615e64e..45f5f70b2 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -97,12 +97,15 @@ static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t use
 static int manager_dispatch_run_queue(sd_event_source *source, void *userdata);
 
 static int manager_watch_jobs_in_progress(Manager *m) {
+        usec_t next;
+
         assert(m);
 
         if (m->jobs_in_progress_event_source)
                 return 0;
 
-        return sd_event_add_monotonic(m->event, now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC, 0, manager_dispatch_jobs_in_progress, m, &m->jobs_in_progress_event_source);
+        next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC;
+        return sd_event_add_monotonic(m->event, next, 0, manager_dispatch_jobs_in_progress, m, &m->jobs_in_progress_event_source);
 }
 
 #define CYLON_BUFFER_EXTRA (2*(sizeof(ANSI_RED_ON)-1) + sizeof(ANSI_HIGHLIGHT_RED_ON)-1 + 2*(sizeof(ANSI_HIGHLIGHT_OFF)-1))
@@ -136,6 +139,16 @@ static void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned po
         }
 }
 
+void manager_flip_auto_status(Manager *m, bool enable) {
+        if (enable) {
+                if (m->show_status == SHOW_STATUS_AUTO)
+                        manager_set_show_status(m, SHOW_STATUS_TEMPORARY);
+        } else {
+                if (m->show_status == SHOW_STATUS_TEMPORARY)
+                        manager_set_show_status(m, SHOW_STATUS_AUTO);
+        }
+}
+
 static void manager_print_jobs_in_progress(Manager *m) {
         _cleanup_free_ char *job_of_n = NULL;
         Iterator i;
@@ -148,8 +161,7 @@ static void manager_print_jobs_in_progress(Manager *m) {
 
         assert(m);
 
-        if (m->show_status == SHOW_STATUS_AUTO)
-                manager_set_show_status(m, SHOW_STATUS_TEMPORARY);
+        manager_flip_auto_status(m, true);
 
         print_nr = (m->jobs_in_progress_iteration / JOBS_IN_PROGRESS_PERIOD_DIVISOR) % m->n_running_jobs;
 
@@ -586,7 +598,7 @@ static int manager_setup_kdbus(Manager *m) {
          * necessary to ensure that users cannot get access to busses
          * of virtualized users when no UID namespacing is used. */
         if (m->running_as == SYSTEMD_SYSTEM)
-                mkdir_p_label("/dev/kdbus/ns", 0700);
+                mkdir_p_label("/dev/kdbus/domain", 0700);
 #endif
 
         return 0;
@@ -2453,14 +2465,13 @@ void manager_check_finished(Manager *m) {
 
         if (hashmap_size(m->jobs) > 0) {
                 if (m->jobs_in_progress_event_source) {
-                        uint64_t next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC;
+                        uint64_t next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC;
                         sd_event_source_set_time(m->jobs_in_progress_event_source, next);
                 }
                 return;
         }
 
-        if (m->show_status == SHOW_STATUS_TEMPORARY)
-                manager_set_show_status(m, SHOW_STATUS_AUTO);
+        manager_flip_auto_status(m, false);
 
         /* Notify Type=idle units that we are done now */
         m->idle_pipe_event_source = sd_event_source_unref(m->idle_pipe_event_source);