X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=86ccc72a168be8b7472fe062f2137b2e1c741cfa;hb=4ade7963ed9c2a0d1a248d291a6fc9a4c4bad8de;hp=eb659c79fb77549c6c48127f90ac8ee35ec28e0a;hpb=ea4309869e75497ba6a97c540646cb66a157a4d9;p=elogind.git
diff --git a/main.c b/main.c
index eb659c79f..86ccc72a1 100644
--- a/main.c
+++ b/main.c
@@ -1,25 +1,76 @@
/*-*- 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
#include
+#include
+#include
#include "manager.h"
#include "log.h"
+#include "mount-setup.h"
int main(int argc, char *argv[]) {
Manager *m = NULL;
Unit *target = NULL;
Job *job = NULL;
int r, retval = 1;
+ const char *default_unit;
+
+ if (argc >= 2)
+ default_unit = argv[1];
+ else
+ default_unit = SPECIAL_DEFAULT_TARGET;
+
+ /* Move out of the way, so that we won't block unmounts */
+ assert_se(chdir("/") == 0);
- assert_se(set_unit_path("test1") >= 0);
+ /* Reset all signal handlers. */
+ assert_se(reset_all_signal_handlers() == 0);
- if (!(m = manager_new())) {
- log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
+ /* Become a session leader if we aren't one yet. */
+ setsid();
+
+ /* Disable the umask logic */
+ umask(0);
+
+ /* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */
+ dbus_connection_set_change_sigpipe(FALSE);
+
+ /* Mount /dev, /sys and friends */
+ mount_setup();
+
+ /* Set up logging */
+ log_set_target(LOG_TARGET_CONSOLE);
+
+ /* Open the logging devices, if possible and necessary*/
+ log_open_syslog();
+ log_open_kmsg();
+
+ if ((r = manager_new(&m)) < 0) {
+ log_error("Failed to allocate manager object: %s", strerror(-r));
goto finish;
}
@@ -28,7 +79,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;
}