machine-id: initialize from $container_uuid if not set otherwise

This is a result of the discussions on

https://bugs.freedesktop.org/show_bug.cgi?id=46894
This commit is contained in:
Lennart Poettering 2012-03-14 14:06:42 +01:00
parent 2d44fc7ba5
commit 09b967eaa5

View file

@ -35,6 +35,28 @@
#include "log.h"
#include "virt.h"
static int shorten_uuid(char destination[36], const char *source) {
unsigned i, j;
for (i = 0, j = 0; i < 36 && j < 32; i++) {
int t;
t = unhexchar(source[i]);
if (t < 0)
continue;
destination[j++] = hexchar(t);
}
if (i == 36 && j == 32) {
destination[32] = '\n';
destination[33] = 0;
return 0;
}
return -EINVAL;
}
static int generate(char id[34]) {
int fd, r;
unsigned char *p;
@ -75,22 +97,8 @@ static int generate(char id[34]) {
close_nointr_nofail(fd);
if (k >= 36) {
unsigned i, j;
for (i = 0, j = 0; i < 36 && j < 32; i++) {
int t;
t = unhexchar(uuid[i]);
if (t < 0)
continue;
id[j++] = hexchar(t);
}
if (i == 36 && j == 32) {
id[32] = '\n';
id[33] = 0;
r = shorten_uuid(id, uuid);
if (r >= 0) {
log_info("Initializing machine ID from KVM UUID");
return 0;
}
@ -98,6 +106,51 @@ static int generate(char id[34]) {
}
}
/* 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);
if (r > 0) {
FILE *f;
f = fopen("/proc/1/environ", "re");
if (f) {
bool done = false;
do {
char line[LINE_MAX];
unsigned i;
for (i = 0; i < sizeof(line)-1; i++) {
int c;
c = getc(f);
if (_unlikely_(c == EOF)) {
done = true;
break;
} else if (c == 0)
break;
line[i] = c;
}
line[i] = 0;
if (startswith(line, "container_uuid=") &&
strlen(line + 15) >= 36) {
r = shorten_uuid(id, line + 15);
if (r >= 0) {
log_info("Initializing machine ID from container UUID");
return 0;
}
}
} while (!done);
fclose(f);
}
}
/* If that didn't work, generate a random machine id */
r = sd_id128_randomize(&buf);
if (r < 0) {