X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=b4fbdb58f5243027eef64ad5f5868b3ead27706c;hb=70123e68a04016efca9266fc22dd05a0a7fd2d51;hp=c2f1ef856d5703769688c457522ba2d2282f6dda;hpb=a5dab5ce0fd4aafc394afe30eda0e6b01a13256b;p=elogind.git

diff --git a/main.c b/main.c
index c2f1ef856..b4fbdb58f 100644
--- a/main.c
+++ b/main.c
@@ -35,7 +35,8 @@
 
 static enum {
         ACTION_RUN,
-        ACTION_HELP
+        ACTION_HELP,
+        ACTION_TEST
 } action = ACTION_RUN;
 
 static char *default_unit = NULL;
@@ -69,7 +70,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=")) {
 
@@ -134,7 +135,8 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_LOG_LEVEL = 0x100,
                 ARG_LOG_TARGET,
                 ARG_DEFAULT,
-                ARG_RUNNING_AS
+                ARG_RUNNING_AS,
+                ARG_TEST
         };
 
         static const struct option options[] = {
@@ -142,6 +144,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "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' },
                 { NULL,         0,                 NULL, 0 }
         };
@@ -193,6 +196,10 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
                 }
 
+                case ARG_TEST:
+                        action = ACTION_TEST;
+                        break;
+
                 case 'h':
                         action = ACTION_HELP;
                         break;
@@ -205,11 +212,6 @@ static int parse_argv(int argc, char *argv[]) {
                         return -EINVAL;
                 }
 
-        if (optind < argc) {
-                log_error("Too many arguments.");
-                return -EINVAL;
-        }
-
         return 0;
 }
 
@@ -220,7 +222,8 @@ static int help(void) {
                "     --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, sesstion)\n",
+               "     --running-as=AS      Set running as (init, system, session)\n"
+               "     --test               Determine startup sequence, dump it and exit\n",
                __progname);
 
         return 0;
@@ -244,7 +247,8 @@ int main(int argc, char *argv[]) {
 
         /* 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);
@@ -266,7 +270,10 @@ int main(int argc, char *argv[]) {
                 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", false);
 
         /* Move out of the way, so that we won't block unmounts */
         assert_se(chdir("/")  == 0);
@@ -300,19 +307,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));