clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 23:38:39 +00: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

(cherry picked from commit 0b36bbc42d)

Conflicts:
	src/core/machine-id-setup.c
This commit is contained in:
Lennart Poettering
2014-06-07 18:31:26 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent ae6feb2a01
commit 0ade4b119d
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/machine-id-setup.c
+24 -23
View File
@@ -88,29 +88,6 @@ static int generate(char id[34]) {
}
}
/* If that didn't work, 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);
close_nointr_nofail(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 */
@@ -128,6 +105,30 @@ static int generate(char id[34]) {
}
}
}
} 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);
close_nointr_nofail(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 */