X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=082ac4bb1b7a2c254531453ee372acc1cfd6bfd9;hb=dec1c02a34b4c5b9da5d2da2dcc09646cf1cef29;hp=acfa35fe6e76f309bb92c98dbe30352dcfbbc4c3;hpb=f170852aea19408cfefcd1b9df4aa8942dbbca98;p=elogind.git diff --git a/main.c b/main.c index acfa35fe6..082ac4bb1 100644 --- a/main.c +++ b/main.c @@ -32,13 +32,18 @@ #include "manager.h" #include "log.h" #include "mount-setup.h" +#include "hostname-setup.h" +#include "load-fragment.h" static enum { ACTION_RUN, - ACTION_HELP + ACTION_HELP, + ACTION_TEST, + ACTION_DUMP_CONFIGURATION_ITEMS } action = ACTION_RUN; static char *default_unit = NULL; +static ManagerRunningAs running_as = _MANAGER_RUNNING_AS_INVALID; static int set_default_unit(const char *u) { char *c; @@ -68,7 +73,7 @@ static int parse_proc_cmdline_word(const char *word) { }; if (startswith(word, "systemd.default=")) - return set_default_unit(word + 15); + return set_default_unit(word + 16); else if (startswith(word, "systemd.log_target=")) { @@ -132,14 +137,20 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_LOG_LEVEL = 0x100, ARG_LOG_TARGET, - ARG_DEFAULT + ARG_DEFAULT, + ARG_RUNNING_AS, + ARG_TEST, + ARG_DUMP_CONFIGURATION_ITEMS }; static const struct option options[] = { { "log-level", required_argument, NULL, ARG_LOG_LEVEL }, { "log-target", required_argument, NULL, ARG_LOG_TARGET }, { "default", required_argument, NULL, ARG_DEFAULT }, + { "running-as", required_argument, NULL, ARG_RUNNING_AS }, + { "test", no_argument, NULL, ARG_TEST }, { "help", no_argument, NULL, 'h' }, + { "dump-configuration-items", no_argument, NULL, ARG_DUMP_CONFIGURATION_ITEMS }, { NULL, 0, NULL, 0 } }; @@ -178,6 +189,26 @@ static int parse_argv(int argc, char *argv[]) { break; + case ARG_RUNNING_AS: { + ManagerRunningAs as; + + if ((as = manager_running_as_from_string(optarg)) < 0) { + log_error("Failed to parse running as value %s", optarg); + return -EINVAL; + } + + running_as = as; + break; + } + + case ARG_TEST: + action = ACTION_TEST; + break; + + case ARG_DUMP_CONFIGURATION_ITEMS: + action = ACTION_DUMP_CONFIGURATION_ITEMS; + break; + case 'h': action = ACTION_HELP; break; @@ -190,21 +221,19 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } - if (optind < argc) { - log_error("Too many arguments."); - return -EINVAL; - } - return 0; } static int help(void) { printf("%s [options]\n\n" - " -h --help Show this help\n" - " --default=UNIT Set default unit\n" - " --log-level=LEVEL Set log level\n" - " --log-target=TARGET Set log target (console, syslog, kmsg)\n", + " -h --help Show this help\n" + " --default=UNIT Set default unit\n" + " --log-level=LEVEL Set log level\n" + " --log-target=TARGET Set log target (console, syslog, kmsg)\n" + " --running-as=AS Set running as (init, system, session)\n" + " --test Determine startup sequence, dump it and exit\n" + " --dump-configuration-items Dump understood unit configuration items\n", __progname); return 0; @@ -216,12 +245,20 @@ int main(int argc, char *argv[]) { Job *job = NULL; int r, retval = 1; + if (getpid() == 1) + running_as = MANAGER_INIT; + else if (getuid() == 0) + running_as = MANAGER_SYSTEM; + else + running_as = MANAGER_SESSION; + if (set_default_unit(SPECIAL_DEFAULT_TARGET) < 0) goto finish; /* Mount /proc, /sys and friends, so that /proc/cmdline and * /proc/$PID/fd is available. */ - mount_setup(); + if (mount_setup() < 0) + goto finish; /* Reset all signal handlers. */ assert_se(reset_all_signal_handlers() == 0); @@ -229,8 +266,9 @@ int main(int argc, char *argv[]) { /* Close all open files */ assert_se(close_all_fds(NULL, 0) == 0); - if (parse_proc_cmdline() < 0) - goto finish; + if (running_as != MANAGER_SESSION) + if (parse_proc_cmdline() < 0) + goto finish; log_parse_environment(); @@ -240,9 +278,18 @@ int main(int argc, char *argv[]) { if (action == ACTION_HELP) { retval = help(); goto finish; + } else if (action == ACTION_DUMP_CONFIGURATION_ITEMS) { + unit_dump_config_items(stdout); + retval = 0; + goto finish; } - assert_se(action == ACTION_RUN); + assert_se(action == ACTION_RUN || action == ACTION_TEST); + + /* Set up PATH unless it is already set */ + setenv("PATH", + "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + running_as == MANAGER_INIT); /* Move out of the way, so that we won't block unmounts */ assert_se(chdir("/") == 0); @@ -260,7 +307,12 @@ int main(int argc, char *argv[]) { log_open_syslog(); log_open_kmsg(); - if ((r = manager_new(&m)) < 0) { + log_debug("systemd running in %s mode.", manager_running_as_to_string(running_as)); + + if (running_as == MANAGER_INIT) + hostname_setup(); + + if ((r = manager_new(running_as, &m)) < 0) { log_error("Failed to allocate manager object: %s", strerror(-r)); goto finish; } @@ -274,19 +326,34 @@ int main(int argc, char *argv[]) { if ((r = manager_load_unit(m, default_unit, &target)) < 0) { log_error("Failed to load default target: %s", strerror(-r)); - goto finish; + + log_info("Trying to load rescue target..."); + if ((r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, &target)) < 0) { + log_error("Failed to load rescue target: %s", strerror(-r)); + goto finish; + } } - printf("→ By units:\n"); - manager_dump_units(m, stdout, "\t"); + if (action == ACTION_TEST) { + 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 jobs:\n"); - manager_dump_jobs(m, stdout, "\t"); + if (action == ACTION_TEST) { + printf("→ By jobs:\n"); + manager_dump_jobs(m, stdout, "\t"); + + if (getpid() == 1) + pause(); + + retval = 0; + goto finish; + } if ((r = manager_loop(m)) < 0) { log_error("Failed to run mainloop: %s", strerror(-r));