X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=15ed0f1e2e75af78048037e9bef537d995513778;hb=a23da0622c9abf088428309e3f1b83e9b1b02d2e;hp=acfa35fe6e76f309bb92c98dbe30352dcfbbc4c3;hpb=f170852aea19408cfefcd1b9df4aa8942dbbca98;p=elogind.git

diff --git a/main.c b/main.c
index acfa35fe6..15ed0f1e2 100644
--- a/main.c
+++ b/main.c
@@ -35,10 +35,12 @@
 
 static enum {
         ACTION_RUN,
-        ACTION_HELP
+        ACTION_HELP,
+        ACTION_TEST
 } 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;
@@ -132,13 +134,17 @@ 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
         };
 
         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' },
                 { NULL,         0,                 NULL, 0 }
         };
@@ -178,6 +184,22 @@ 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 'h':
                         action = ACTION_HELP;
                         break;
@@ -190,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;
 }
 
@@ -204,7 +221,9 @@ static int help(void) {
                "  -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",
+               "     --log-target=TARGET  Set log target (console, syslog, kmsg)\n"
+               "     --running-as=AS      Set running as (init, system, sesstion)\n"
+               "     --test               Determine startup sequence, dump it and exit\n",
                __progname);
 
         return 0;
@@ -216,6 +235,13 @@ 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;
 
@@ -229,8 +255,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();
 
@@ -242,7 +269,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        assert_se(action == ACTION_RUN);
+        assert_se(action == ACTION_RUN || action == ACTION_TEST);
 
         /* Move out of the way, so that we won't block unmounts */
         assert_se(chdir("/")  == 0);
@@ -260,7 +287,9 @@ 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 ((r = manager_new(running_as, &m)) < 0) {
                 log_error("Failed to allocate manager object: %s", strerror(-r));
                 goto finish;
         }
@@ -277,16 +306,26 @@ int main(int argc, char *argv[]) {
                 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));