machine-id-setup: `--print --commit` respects the --root option

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index d2bc0d3b8e6853d510d34c236a76204a06efb7c0..d548f0c3453dce776e5ea0ffe36a969a5b337c5b 100644 (file)
--- 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 cc9b1b38febda3f4ff8b7f2855036706c265bdcb..2244b1cc76427480cedb655128451eea64081003 100644 (file)
--- 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;

diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh
index 1423bd891f5e6386b00ec4ed244d7ce4b5311077..201d5281da6a11d4ce9c90b120ea8bd67cc51779 100755 (executable)
--- a/test/TEST-14-MACHINE-ID/test.sh
+++ b/test/TEST-14-MACHINE-ID/test.sh
@@ -80,6 +80,17 @@ echo abc >>"$r/etc/machine-id"
 id=$(systemd-machine-id-setup --print --root "$r")
 echo $id >expected
 check expected "$r/etc/machine-id"
+
+r="$(pwd)/transient-machine-id"
+setup_root "$r"
+touch "$r/etc/machine-id"
+mount -o remount,ro "$r"
+mount -t tmpfs tmpfs "$r/run"
+transient_id=$(systemd-machine-id-setup --print --root "$r")
+mount -o remount,rw "$r"
+commited_id=$(systemd-machine-id-setup --print --commit --root "$r")
+[[ "$transient_id" = "$commited_id" ]]
+check "$r/etc/machine-id" "$r/run/machine-id"
 EOF
 chmod +x $initdir/test-machine-id-setup.sh