diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/path-util.h | 1 | ||||
| -rw-r--r-- | src/machine-id-setup/machine-id-setup-main.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/basic/path-util.h b/src/basic/path-util.h index d2bc0d3b8e..d548f0c345 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,6 +24,7 @@ #include <stddef.h> #include "macro.h" +#include "string-util.h" #include "time-util.h" #define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" 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; |