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

diff --git a/main.c b/main.c
index fde11c094..838f5c89e 100644
--- a/main.c
+++ b/main.c
@@ -1,57 +1,88 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <dbus/dbus.h>
+
 #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;
+        const char *default_unit;
 
-        if (!(m = manager_new()) < 0) {
-                fprintf(stderr, "Failed to allocate manager object: %s\n", strerror(ENOMEM));
+        if (argc >= 2)
+                default_unit = argv[1];
+        else
+                default_unit = SPECIAL_DEFAULT_TARGET;
+
+        if ((r = manager_new(&m)) < 0) {
+                log_error("Failed to allocate manager object: %s", strerror(-r));
                 goto finish;
         }
 
-
-        if ((r = manager_load_name(m, "default.milestone", &milestone) < 0)) {
-                fprintf(stderr, "Failed to load default milestone: %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_load_name(m, "syslog.socket", &syslog) < 0)) {
-                fprintf(stderr, "Failed to load syslog socket: %s\n", strerror(-r));
+        log_debug("Activating default unit: %s", default_unit);
+
+        if ((r = manager_load_unit(m, default_unit, &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) {
-                fprintf(stderr, "Failed to start default milestone: %s\n", 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");
 
-        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_loop(m)) < 0) {
+                log_error("Failed to run mainloop: %s", strerror(-r));
                 goto finish;
         }
 
-        printf("- By jobs:\n");
-        manager_dump_jobs(m, stdout, "\t");
-
         retval = 0;
 
 finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
+        dbus_shutdown();
+
         return retval;
 }