mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-27 20:23:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

machine-id-setup: Do not overwrite if /etc/machine-id contains uninitialized

Browse Source 
When we're building OS images, we never want /etc/machine-id to contain
anything other than "uninitialized" until we actually boot the image. So
let's allow image builders to write "uninitialized" to /etc/machine-id
and if systemd-machine-id-setup is called after, make sure we don't
overwrite it.
This commit is contained in:
Daan De Meyer 2023-05-10 15:16:09 +02:00 committed by Yu Watanabe
parent 048eb301ec
commit 62281c78bb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/machine-id-setup/machine-id-setup-main.c
View File

@ -137,7 +137,6 @@ static int parse_argv(int argc, char *argv[]) {
static int run(int argc, char *argv[]) {
_cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
_cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL;
sd_id128_t id;
int r;
log_parse_environment();
@ -170,6 +169,8 @@ static int run(int argc, char *argv[]) {
}
if (arg_commit) {
sd_id128_t id;
r = machine_id_commit(arg_root);
if (r < 0)
return r;
@ -177,14 +178,23 @@ static int run(int argc, char *argv[]) {
r = id128_get_machine(arg_root, &id);
if (r < 0)
return log_error_errno(r, "Failed to read machine ID back: %m");
if (arg_print)
puts(SD_ID128_TO_STRING(id));
} else if (id128_get_machine(arg_root, NULL) == -ENOPKG) {
if (arg_print)
puts("uninitialized");
} else {
sd_id128_t id;
r = machine_id_setup(arg_root, false, SD_ID128_NULL, &id);
if (r < 0)
return r;
}
if (arg_print)
puts(SD_ID128_TO_STRING(id));
if (arg_print)
puts(SD_ID128_TO_STRING(id));
}
return 0;
}