X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=4456bde638135ef678856752fb8f2a5c18eb774f;hb=8e27452380193a5f81bfd08a59aab8b07008ba0b;hp=e10c57b4457a113fd985b8d6c193ca5a50fec3f1;hpb=44d8db9e5aa86165c97289f6c78a7e42bac78362;p=elogind.git
diff --git a/main.c b/main.c
index e10c57b44..4456bde63 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,26 @@
/*-*- 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 .
+***/
+
+#include
+
#include
#include
#include
@@ -10,39 +31,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) {
- log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
+ 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) {
- 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");
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 +74,9 @@ finish:
if (m)
manager_free(m);
+ log_debug("Exit.");
+
+ dbus_shutdown();
+
return retval;
}