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

diff --git a/src/main.c b/src/main.c
index 313afcce1..5b75ecca8 100644
--- 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 */