morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

main: split out code that sets up the console/terminal and stuff

Browse Source 
More refactoring to make main() more digestable.
This commit is contained in:
Lennart Poettering
2017-12-15 17:13:36 +01:00
parent efeb853fbd
commit 2e51b31caf
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/main.c
View File

@@ -2235,6 +2235,23 @@ static int collect_fds(FDSet **ret_fds, const char **ret_error_message) {
return 0;
}
static void setup_console_terminal(bool skip_setup) {
if (!arg_system)
return;
/* Become a session leader if we aren't one yet. */
(void) setsid();
/* If we are init, we connect stdin/stdout/stderr to /dev/null and make sure we don't have a controlling
* tty. */
(void) release_terminal();
/* Reset the console, but only if this is really init and we are freshly booted */
if (getpid_cached() == 1 && !skip_setup)
(void) console_setup();
}
int main(int argc, char *argv[]) {
Manager *m = NULL;
int r, retval = EXIT_FAILURE;
@@ -2439,18 +2456,8 @@ int main(int argc, char *argv[]) {
if (r < 0)
goto finish;
if (arg_system) {
/* Become a session leader if we aren't one yet. */
setsid();
/* If we are init, we connect stdin/stdout/stderr to /dev/null and make sure we don't have a
* controlling tty. */
release_terminal();
/* Reset the console, but only if this is really init and we are freshly booted */
if (getpid_cached() == 1 && !skip_setup)
console_setup();
}
/* Give up any control of the console, but make sure its initialized. */
setup_console_terminal(skip_setup);
/* Open the logging devices, if possible and necessary */
log_open();