summaryrefslogtreecommitdiff
path: root/src/core/machine-id-setup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-04-22 14:48:46 +0200
committerLennart Poettering <lennart@poettering.net>2012-04-22 15:00:42 +0200
commitab94af9201496ea3aa59bbf2a01eb750fbd1c08a (patch)
treeb62a3fcbea3779855a964e37e1415c75ad1c8816 /src/core/machine-id-setup.c
parent144f0fc0c8a5e2f6b72179e2b5fb992474da24ad (diff)
util: unify getenv() logic for other PID
Diffstat (limited to 'src/core/machine-id-setup.c')
-rw-r--r--src/core/machine-id-setup.c45
1 files changed, 11 insertions, 34 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index 9e84ac0cb9..636519c00c 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -110,45 +110,22 @@ 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;
+ char *e;
- 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;
- }
+ r = getenv_for_pid(1, "container_uuid", &e);
+ if (r > 0) {
+ if (strlen(e) >= 36) {
+ r = shorten_uuid(id, e);
+ if (r >= 0) {
+ log_info("Initializing machine ID from container UUID");
+ free(e);
+ return 0;
}
+ }
- } while (!done);
-
- fclose(f);
+ free(e);
}
}