X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=main.c;h=be733f0cd2b570b7fcac8b1c9fccf5d360a87bfa;hp=fde11c094b2754467ceb2069a34e71d55e40d7ea;hb=f50e0a012340fa8dfe6ec7f0cd869f5f3a052d7a;hpb=cea8e32e3fc57569094e2ddf4167f2a9864fc3a4

diff --git a/main.c b/main.c
index fde11c094..be733f0cd 100644
--- a/main.c
+++ b/main.c
@@ -3,55 +3,57 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "manager.h"
+#include "log.h"
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        Name *milestone = NULL, *syslog = NULL;
+        Unit *target = NULL;
         Job *job = NULL;
         int r, retval = 1;
 
-        if (!(m = manager_new()) < 0) {
-                fprintf(stderr, "Failed to allocate manager object: %s\n", strerror(ENOMEM));
-                goto finish;
-        }
+        assert_se(set_unit_path("test1") >= 0);
 
-
-        if ((r = manager_load_name(m, "default.milestone", &milestone) < 0)) {
-                fprintf(stderr, "Failed to load default milestone: %s\n", strerror(-r));
+        if (!(m = manager_new()) < 0) {
+                log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
                 goto finish;
         }
 
-        if ((r = manager_load_name(m, "syslog.socket", &syslog) < 0)) {
-                fprintf(stderr, "Failed to load syslog socket: %s\n", 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, milestone, JOB_REPLACE, false, &job)) < 0) {
-                fprintf(stderr, "Failed to start default milestone: %s\n", 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 names:\n");
-        manager_dump_names(m, stdout, "\t");
+        printf("→ By units:\n");
+        manager_dump_units(m, stdout, "\t");
 
-        printf("- By jobs:\n");
-        manager_dump_jobs(m, stdout, "\t");
-
-        if ((r = manager_add_job(m, JOB_STOP, syslog, JOB_REPLACE, false, &job)) < 0) {
-                fprintf(stderr, "Failed to start default milestone: %s\n", 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 jobs:\n");
+        printf("→ By jobs:\n");
         manager_dump_jobs(m, stdout, "\t");
 
+        /* if ((r = manager_loop(m)) < 0) { */
+        /*         log_error("Failed to run mainloop: %s", strerror(-r)); */
+        /*         goto finish; */
+        /* } */
+
         retval = 0;
 
 finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
         return retval;
 }