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

[thirdparty/systemd.git] / src / machine-id-setup / machine-id-setup-main.c

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 5620bf9bafc750da7c1b8bd155548a846a94fac0..2d2989086437fe2a2e3d4ec4a57cdfbc700bce33 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -158,14 +158,11 @@ 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;
 
-                etc_machine_id = prefix_roota(arg_root, "/etc/machine-id");
-                r = id128_read(etc_machine_id, ID128_FORMAT_PLAIN, &id);
+                r = id128_read(arg_root, "/etc/machine-id", ID128_FORMAT_PLAIN, &id);
                 if (r < 0)
                         return log_error_errno(r, "Failed to read machine ID back: %m");
         } else {