X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=082ac4bb1b7a2c254531453ee372acc1cfd6bfd9;hb=dec1c02a34b4c5b9da5d2da2dcc09646cf1cef29;hp=397e868e97461e37871b74d5b8391bd0d624848b;hpb=d89e521eadeccc17fd10b574106c0fcd9e9f9340;p=elogind.git

diff --git a/main.c b/main.c
index 397e868e9..082ac4bb1 100644
--- a/main.c
+++ b/main.c
@@ -32,11 +32,14 @@
 #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_TEST
+        ACTION_TEST,
+        ACTION_DUMP_CONFIGURATION_ITEMS
 } action = ACTION_RUN;
 
 static char *default_unit = NULL;
@@ -70,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=")) {
 
@@ -136,7 +139,8 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_LOG_TARGET,
                 ARG_DEFAULT,
                 ARG_RUNNING_AS,
-                ARG_TEST
+                ARG_TEST,
+                ARG_DUMP_CONFIGURATION_ITEMS
         };
 
         static const struct option options[] = {
@@ -146,6 +150,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "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 }
         };
 
@@ -200,6 +205,10 @@ static int parse_argv(int argc, char *argv[]) {
                         action = ACTION_TEST;
                         break;
 
+                case ARG_DUMP_CONFIGURATION_ITEMS:
+                        action = ACTION_DUMP_CONFIGURATION_ITEMS;
+                        break;
+
                 case 'h':
                         action = ACTION_HELP;
                         break;
@@ -218,12 +227,13 @@ static int parse_argv(int argc, char *argv[]) {
 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"
-               "     --running-as=AS      Set running as (init, system, session)\n"
-               "     --test               Determine startup sequence, dump it and exit\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;
@@ -268,10 +278,19 @@ 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 || 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);
 
@@ -290,6 +309,9 @@ int main(int argc, char *argv[]) {
 
         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;
@@ -304,7 +326,12 @@ 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;
+                }
         }
 
         if (action == ACTION_TEST) {