nspawn: allocate a new pty instead of passing ours through to avoid terminal settings...

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 313afcce166d2f7bc0d82130930751c980cf7a78..5b75ecca8e83383bc86e08c2d034fd12200acb23 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -848,7 +848,7 @@ static int parse_argv(int argc, char *argv[]) {
                          * relevant for us, hence we rely on argv[]
                          * instead. */
 
-                        for (a = argv + optind; a < argv + argc; a++)
+                        for (a = argv; a < argv + argc; a++)
                                 if ((r = parse_proc_cmdline_word(*a)) < 0)
                                         return r;
                 }
@@ -1021,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 */