mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-18 06:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

machine-id: only look into KVM uuid when we are not running in a

Browse Source 
container
This commit is contained in:
Lennart Poettering 2014-04-28 18:11:40 +02:00
parent 687ed1237b
commit 0b36bbc42d
Notes: Lennart Poettering 2014-05-24 13:36:13 +08:00 
Backport: bugfix
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/core/machine-id-setup.c
View File

@ -93,32 +93,9 @@ static int generate(char id[34], const char *root) {
} }
} }
/* If that didn't work, see if we are running in qemu/kvm and a /* If that didn't work, see if we are running in a container,
* machine ID was passed in via -uuid on the qemu/kvm command * and a machine ID was passed in via $container_uuid the way
* line */ * libvirt/LXC does it */
r = detect_vm(&vm_id);
if (r > 0 && streq(vm_id, "kvm")) {
char uuid[37];
fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
if (fd >= 0) {
k = loop_read(fd, uuid, 36, false);
safe_close(fd);
if (k >= 36) {
r = shorten_uuid(id, uuid);
if (r >= 0) {
log_info("Initializing machine ID from KVM UUID.");
return 0;
}
}
}
}
/* If that didn't work either, see if we are running in a
* container, and a machine ID was passed in via
* $container_uuid the way libvirt/LXC does it */
r = detect_container(NULL); r = detect_container(NULL);
if (r > 0) { if (r > 0) {
_cleanup_free_ char *e = NULL; _cleanup_free_ char *e = NULL;
@ -133,6 +110,30 @@ static int generate(char id[34], const char *root) {
} }
} }
} }
} else {
/* If we are not running in a container, see if we are
* running in qemu/kvm and a machine ID was passed in
* via -uuid on the qemu/kvm command line */
r = detect_vm(&vm_id);
if (r > 0 && streq(vm_id, "kvm")) {
char uuid[37];
fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
if (fd >= 0) {
k = loop_read(fd, uuid, 36, false);
safe_close(fd);
if (k >= 36) {
r = shorten_uuid(id, uuid);
if (r >= 0) {
log_info("Initializing machine ID from KVM UUID.");
return 0;
}
}
}
}
} }
/* If that didn't work, generate a random machine id */ /* If that didn't work, generate a random machine id */