picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

main: simplify arg_system initialization a bit

Browse source 
For both branches of the if check it's the first line, hence let's just
do it before.
This commit is contained in:
Lennart Poettering 2018-06-13 18:47:13 +02:00
parent bda7d78ba1
commit b5752d2352
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/main.c
View file

@ -2188,6 +2188,9 @@ int main(int argc, char *argv[]) {
log_set_upgrade_syslog_to_journal(true);
if (getpid_cached() == 1) {
/* When we run as PID 1 force system mode */
arg_system = true;
/* Disable the umask logic */
umask(0);
@ -2204,7 +2207,6 @@ int main(int argc, char *argv[]) {
if (detect_container() <= 0) {
/* Running outside of a container as PID 1 */
arg_system = true;
log_set_target(LOG_TARGET_KMSG);
log_open();
@ -2243,7 +2245,6 @@ int main(int argc, char *argv[]) {
} else {
/* Running inside a container, as PID 1 */
arg_system = true;
log_set_target(LOG_TARGET_CONSOLE);
log_open();