X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmain.c;h=5b75ecca8e83383bc86e08c2d034fd12200acb23;hb=a258bf2648fa5e3005b96203c60b9751807bacf0;hp=769fc6772cad56aae5809b50beb1144195ba1d26;hpb=b0c8757b056c18863d2f9c07ca3ba21f64a47b54;p=elogind.git

diff --git a/src/main.c b/src/main.c
index 769fc6772..5b75ecca8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -226,6 +226,8 @@ static int parse_proc_cmdline_word(const char *word) {
 
         static const char * const rlmap[] = {
                 "emergency", SPECIAL_EMERGENCY_TARGET,
+                "-b",        SPECIAL_EMERGENCY_TARGET,
+                "b",         SPECIAL_EMERGENCY_TARGET,
                 "single",    SPECIAL_RESCUE_TARGET,
                 "-s",        SPECIAL_RESCUE_TARGET,
                 "s",         SPECIAL_RESCUE_TARGET,
@@ -544,6 +546,11 @@ static int parse_proc_cmdline(void) {
         int r;
         size_t l;
 
+        /* Don't read /proc/cmdline if we are in a container, since
+         * that is only relevant for the host system */
+        if (detect_container(NULL) > 0)
+                return 0;
+
         if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
                 log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
                 return 0;
@@ -624,7 +631,10 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hD", options, NULL)) >= 0)
+        if (getpid() == 1)
+                opterr = 0;
+
+        while ((c = getopt_long(argc, argv, "hDbsz:", options, NULL)) >= 0)
 
                 switch (c) {
 
@@ -800,21 +810,48 @@ static int parse_argv(int argc, char *argv[]) {
                         log_set_max_level(LOG_DEBUG);
                         break;
 
-                case '?':
-                        return -EINVAL;
+                case 'b':
+                case 's':
+                case 'z':
+                        /* Just to eat away the sysvinit kernel
+                         * cmdline args without getopt() error
+                         * messages that we'll parse in
+                         * parse_proc_cmdline_word() or ignore. */
 
+                case '?':
                 default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        if (getpid() != 1) {
+                                log_error("Unknown option code %c", c);
+                                return -EINVAL;
+                        }
+
+                        break;
                 }
 
-        /* PID 1 will get the kernel arguments as parameters, which we
-         * ignore and unconditionally read from
-         * /proc/cmdline. However, we need to ignore those arguments
-         * here. */
-        if (arg_running_as != MANAGER_SYSTEM && optind < argc) {
-                log_error("Excess arguments.");
-                return -EINVAL;
+        if (optind < argc) {
+                if (getpid() != 1) {
+                        /* Hmm, when we aren't run as init system
+                         * let's complain about excess arguments */
+
+                        log_error("Excess arguments.");
+                        return -EINVAL;
+
+                } else if (detect_container(NULL) > 0) {
+                        char **a;
+
+                        /* All /proc/cmdline arguments the kernel
+                         * didn't understand it passed to us. We're
+                         * note really interested in that usually
+                         * since /proc/cmdline is more interesting and
+                         * complete. With one exception: if we are run
+                         * in a container /proc/cmdline is not
+                         * relevant for us, hence we rely on argv[]
+                         * instead. */
+
+                        for (a = argv; a < argv + argc; a++)
+                                if ((r = parse_proc_cmdline_word(*a)) < 0)
+                                        return r;
+                }
         }
 
         return 0;
@@ -984,7 +1021,7 @@ int main(int argc, char *argv[]) {
 
         if (getpid() == 1) {
                 arg_running_as = MANAGER_SYSTEM;
-                log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+                log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_SYSLOG_OR_KMSG);
 
                 /* This might actually not return, but cause a
                  * reexecution */
@@ -1030,9 +1067,16 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (arg_running_as == MANAGER_SYSTEM &&
+            arg_action == ACTION_RUN &&
+            running_in_chroot() > 0) {
+                log_error("Cannot be run in a chroot() environment.");
+                goto finish;
+        }
+
         /* If Plymouth is being run make sure we show the status, so
          * that there's something nice to see when people press Esc */
-        if (access("/dev/.run/systemd/plymouth", F_OK) >= 0)
+        if (access("/dev/.run/initramfs/plymouth", F_OK) >= 0)
                 arg_show_status = true;
 
         if (arg_action == ACTION_HELP) {
@@ -1074,6 +1118,9 @@ int main(int argc, char *argv[]) {
                  * kernel that don't really make sense for us. */
                 unsetenv("HOME");
                 unsetenv("TERM");
+
+                /* All other variables are left as is, so that clients
+                 * can still read them via /proc/1/environ */
         }
 
         /* Move out of the way, so that we won't block unmounts */