diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-12-13 20:31:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-13 20:31:09 +0100 |
| commit | 9ef4e1e5a2d0a9cc50406f1cae05f3918d6f0c2a (patch) | |
| tree | a5c2639173e88e00927445ac5dffdf88b3fe52aa /src/machine-id-setup/machine-id-setup-main.c | |
| parent | 6916b164642d8bb4938878f4284f8ee5ccf3efd6 (diff) | |
| parent | 069a254f9b5133ebf9e2258628917954b75d6b86 (diff) | |
Merge pull request #4877 from evverx/fix-machine-id
handle corrupted /etc/machine-id nicer
Diffstat (limited to 'src/machine-id-setup/machine-id-setup-main.c')
| -rw-r--r-- | src/machine-id-setup/machine-id-setup-main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index cc9b1b38fe..2244b1cc76 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> +#include "id128-util.h" #include "log.h" #include "machine-id-setup.h" #include "path-util.h" @@ -118,11 +119,14 @@ int main(int argc, char *argv[]) { goto finish; if (arg_commit) { + const char *etc_machine_id; + r = machine_id_commit(arg_root); if (r < 0) goto finish; - r = sd_id128_get_machine(&id); + etc_machine_id = prefix_roota(arg_root, "/etc/machine-id"); + r = id128_read(etc_machine_id, ID128_PLAIN, &id); if (r < 0) { log_error_errno(r, "Failed to read machine ID back: %m"); goto finish; |