X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=main.c;h=2486f06292144d4e4ea941c18cf826e731bcc701;hp=a7738f01717df15d965f39de626d23841973a3ea;hb=d46de8a1a249e179687361dcaeba27e1c586253a;hpb=034c6ed7da5e44bfdde5a5d0da75f7b7a59953b8

diff --git a/main.c b/main.c
index a7738f017..2486f0629 100644
--- a/main.c
+++ b/main.c
@@ -10,39 +10,37 @@
 
 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) {
                 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_load_unit(m, "default.target", &target)) < 0) {
+                log_error("Failed to load default target: %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));
-                goto finish;
-        }
+        printf("→ By units:\n");
+        manager_dump_units(m, stdout, "\t");
 
-        if ((r = manager_add_job(m, JOB_START, milestone, JOB_REPLACE, false, &job)) < 0) {
-                log_error("Failed to start default milestone: %s", strerror(-r));
+        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_loop(m);
+        if ((r = manager_loop(m)) < 0) {
+                log_error("Failed to run mainloop: %s", strerror(-r));
+                goto finish;
+        }
 
         retval = 0;
 
@@ -50,5 +48,7 @@ finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
         return retval;
 }