shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

core: treat "uninitialized" in /etc/machine-id as first boot as well

Browse Source 
When /etc/machine-id contains the string "uninitialized" instead of
a valid machine-id, treat this like the file was missing and mark this
boot as the first (-> units with ConditionFirstBoot=yes will run).
This commit is contained in:
Harald Seiler 2020-09-06 21:23:35 +02:00
parent 7139e9d9a3
commit 583cef3b73
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/main.c
View File

@ -2001,15 +2001,26 @@ static void log_execution_mode(bool *ret_first_boot) {
*ret_first_boot = false; *ret_first_boot = false;
log_info("Running in initial RAM disk."); log_info("Running in initial RAM disk.");
} else { } else {
/* Let's check whether we are in first boot, i.e. whether /etc is still unpopulated. We use int r;
* /etc/machine-id as flag file, for this: if it exists we assume /etc is populated, if it _cleanup_free_ char *id_text = NULL;
* doesn't it's unpopulated. This allows container managers and installers to provision a
* couple of files already. If the container manager wants to provision the machine ID itself
* it should pass $container_uuid to PID 1. */
*ret_first_boot = access("/etc/machine-id", F_OK) < 0; /* Let's check whether we are in first boot. We use /etc/machine-id as flag file
if (*ret_first_boot) * for this: If it is missing or contains the value "uninitialized", this is the
log_info("Running with unpopulated /etc."); * first boot. In any other case, it is not. This allows container managers and
* installers to provision a couple of files already. If the container manager
* wants to provision the machine ID itself it should pass $container_uuid to PID 1. */
r = read_one_line_file("/etc/machine-id", &id_text);
if (r < 0 || streq(id_text, "uninitialized")) {
if (r < 0 && r != -ENOENT)
log_warning_errno(r, "Unexpected error while reading /etc/machine-id, ignoring: %m");
*ret_first_boot = true;
log_info("Detected first boot.");
} else {
*ret_first_boot = false;
log_debug("Detected initialized system, this is not the first boot.");
}
} }
} else { } else {
if (DEBUG_LOGGING) { if (DEBUG_LOGGING) {