X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=main.c;h=eb659c79fb77549c6c48127f90ac8ee35ec28e0a;hb=ea4309869e75497ba6a97c540646cb66a157a4d9;hp=e139c4b191da8b60985dabf06c1ba03141cee6f3;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662;p=elogind.git

diff --git a/main.c b/main.c
index e139c4b19..eb659c79f 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,7 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+#include <dbus/dbus.h>
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -14,30 +16,38 @@ int main(int argc, char *argv[]) {
         Job *job = NULL;
         int r, retval = 1;
 
-        assert_se(chdir("test1") == 0);
+        assert_se(set_unit_path("test1") >= 0);
 
-        if (!(m = manager_new()) < 0) {
+        if (!(m = manager_new())) {
                 log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
                 goto finish;
         }
 
-        if ((r = manager_load_unit(m, "default.target", &target)) < 0) {
-                log_error("Failed to load default target: %s", strerror(-r));
+        if ((r = manager_coldplug(m)) < 0) {
+                log_error("Failed to retrieve coldplug information: %s", strerror(-r));
                 goto finish;
         }
 
-        if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &job)) < 0) {
-                log_error("Failed to start default target: %s", strerror(-r));
+        if ((r = manager_load_unit(m, SPECIAL_DEFAULT_TARGET, &target)) < 0) {
+                log_error("Failed to load default target: %s", strerror(-r));
                 goto finish;
         }
 
         printf("→ By units:\n");
         manager_dump_units(m, stdout, "\t");
 
+        if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &job)) < 0) {
+                log_error("Failed to start default target: %s", strerror(-r));
+                goto finish;
+        }
+
         printf("→ By jobs:\n");
         manager_dump_jobs(m, stdout, "\t");
 
-        /* manager_loop(m); */
+        if ((r = manager_loop(m)) < 0) {
+                log_error("Failed to run mainloop: %s", strerror(-r));
+                goto finish;
+        }
 
         retval = 0;
 
@@ -45,5 +55,9 @@ finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
+        dbus_shutdown();
+
         return retval;
 }