From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 1 Apr 2023 13:49:47 +0000 (+0900)
Subject: machine-id-setup: use id128_get_machine() at one more place
X-Git-Tag: v254-rc1~806^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1d74108a0b99e1e4520a69724a52b7100bec348;p=thirdparty%2Fsystemd.git

machine-id-setup: use id128_get_machine() at one more place
---

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 5620bf9bafc..223164ea1bd 100644
--- 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_get_machine(arg_root, &id);
                 if (r < 0)
                         return log_error_errno(r, "Failed to read machine ID back: %m");
         } else {