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

core: move write_container_id() invocation into initialize_runtime() 

This moves the invocation a bit later, but that shoudln't matter. By
moving it we gain two things: first of all, its closer to other code
where it belongs, secondly its naturally conditioned properly, as we no
longer will rewrite the container ID file on every reexecution again,
and not in test mode either.
This commit is contained in:
Lennart Poettering 2017-12-06 21:42:36 +01:00
parent 5afbaa36f4
commit 6c78f016d7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/main.c
View File

@ -1870,8 +1870,8 @@ static int initialize_runtime(
machine_id_setup(NULL, arg_machine_id, NULL);
loopback_setup();
bump_unix_max_dgram_qlen();
test_usr();
write_container_id();
}
if (arg_system && arg_runtime_watchdog > 0 && arg_runtime_watchdog != USEC_INFINITY)
@ -2307,8 +2307,6 @@ int main(int argc, char *argv[]) {
if (v > 0)
log_info("Detected virtualization %s.", virtualization_to_string(v));
write_container_id();
log_info("Detected architecture %s.", architecture_to_string(uname_architecture()));
if (in_initrd())