diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 19:02:50 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 19:02:50 -0400 |
commit | f3bbbbc700b285242fde052a19c576389f830fef (patch) | |
tree | d65b6a3a7606af5a05a2b52ad91c3e10d5174fd5 /src/core/main.c | |
parent | 17b593aacd4e8d056f2be860a7b744004892ecbd (diff) | |
parent | 5d4922bba91c6d60b3b9f38fb29fda0f6ba8338d (diff) |
Merge branch 'systemd/parabola' into notsystemd/premove
Diffstat (limited to 'src/core/main.c')
-rw-r--r-- | src/core/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c index 719bc49475..33e22e37dc 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2016,9 +2016,6 @@ finish: log_error_errno(r, "Failed to switch root, trying to continue: %m"); } - /* Reopen the console */ - (void) make_console_stdio(); - args_size = MAX(6, argc+1); args = newa(const char*, args_size); @@ -2066,6 +2063,9 @@ finish: arg_serialization = safe_fclose(arg_serialization); fds = fdset_free(fds); + /* Reopen the console */ + (void) make_console_stdio(); + for (j = 1, i = 1; j < (unsigned) argc; j++) args[i++] = argv[j]; args[i++] = NULL; |