Revert "sd-id128: make id128_read() optionally take root directory"

This reverts commit 830e52caa2.
2023-04-04 11:46:18 +09:00
parent de2820606d
commit 17f9d6d806
5 changed files with 16 additions and 13 deletions
@@ -158,11 +158,14 @@ static int run(int argc, char *argv[]) {
        }

        if (arg_commit) {
+                const char *etc_machine_id;
+
                r = machine_id_commit(arg_root);
                if (r < 0)
                        return r;

-                r = id128_read(arg_root, "/etc/machine-id", ID128_FORMAT_PLAIN, &id);
+                etc_machine_id = prefix_roota(arg_root, "/etc/machine-id");
+                r = id128_read(etc_machine_id, ID128_FORMAT_PLAIN, &id);
                if (r < 0)
                        return log_error_errno(r, "Failed to read machine ID back: %m");
        } else {