X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=main.c;h=eb659c79fb77549c6c48127f90ac8ee35ec28e0a;hp=47292bb2041cdca50a0b4955e3e5e956ed611f06;hb=86ad3bc1ce5a6e4d007aaa390f6f7551ff7c9696;hpb=9152c765065184d0c1267ed2499e3fe4cac53755

diff --git a/main.c b/main.c
index 47292bb20..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>
@@ -10,41 +12,42 @@
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        Name *milestone = NULL, *syslog = NULL;
+        Unit *target = NULL;
         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_name(m, "default.milestone", &milestone)) < 0) {
-                log_error("Failed to load default milestone: %s", strerror(-r));
+        if ((r = manager_coldplug(m)) < 0) {
+                log_error("Failed to retrieve coldplug information: %s", strerror(-r));
                 goto finish;
         }
 
-        if ((r = manager_load_name(m, "syslog.socket", &syslog)) < 0) {
-                log_error("Failed to load syslog socket: %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;
         }
 
-        if ((r = manager_add_job(m, JOB_START, milestone, JOB_REPLACE, false, &job)) < 0) {
-                log_error("Failed to start default milestone: %s", strerror(-r));
+        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 names:\n");
-        manager_dump_names(m, stdout, "\t");
-
-        printf("- By jobs:\n");
+        printf("→ By jobs:\n");
         manager_dump_jobs(m, stdout, "\t");
 
-        manager_run_jobs(m);
-
-        manager_loop(m);
+        if ((r = manager_loop(m)) < 0) {
+                log_error("Failed to run mainloop: %s", strerror(-r));
+                goto finish;
+        }
 
         retval = 0;
 
@@ -52,5 +55,9 @@ finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
+        dbus_shutdown();
+
         return retval;
 }