diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 18:47:28 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-10-21 18:47:28 -0400 |
| commit | cb470532e4d6344b44f4473c46b31e8b8d2c1164 (patch) | |
| tree | db9b6d19e020d9f14eff0493c54e5fa83d8f7584 /src/core/main.c | |
| parent | b3ec0a0674f4e499bcb6d2469acdf9d2d574c3d6 (diff) | |
| parent | 53fb76f9f67151ba04cfbce8068e79e8f3c939b4 (diff) | |
Merge tag 'systemd/v231-3.parabola1' into systemd/parabola
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; |