X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=838f5c89e3812a97e21503a000329af5d9f4c0cb;hb=a9a1e00af1059a6b8c3e089238870fbf2608c087;hp=be733f0cd2b570b7fcac8b1c9fccf5d360a87bfa;hpb=f50e0a012340fa8dfe6ec7f0cd869f5f3a052d7a;p=elogind.git
diff --git a/main.c b/main.c
index be733f0cd..838f5c89e 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
@@ -13,11 +34,15 @@ int main(int argc, char *argv[]) {
Unit *target = NULL;
Job *job = NULL;
int r, retval = 1;
+ const char *default_unit;
- assert_se(set_unit_path("test1") >= 0);
+ if (argc >= 2)
+ default_unit = argv[1];
+ else
+ default_unit = SPECIAL_DEFAULT_TARGET;
- 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;
}
@@ -26,7 +51,9 @@ int main(int argc, char *argv[]) {
goto finish;
}
- if ((r = manager_load_unit(m, SPECIAL_DEFAULT_TARGET, &target)) < 0) {
+ 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;
}
@@ -42,10 +69,10 @@ int main(int argc, char *argv[]) {
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; */
- /* } */
+ if ((r = manager_loop(m)) < 0) {
+ log_error("Failed to run mainloop: %s", strerror(-r));
+ goto finish;
+ }
retval = 0;
@@ -55,5 +82,7 @@ finish:
log_debug("Exit.");
+ dbus_shutdown();
+
return retval;
}