X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine-id-setup.c;h=94198cb83bba4de4ed6d3b8ac74589064bc8e6f2;hb=6996295f85a0402b8a72d76c1eab02fb8152f81d;hp=0f97433804e5fa6d7cec6baa259956ec396f6988;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git

diff --git a/src/machine-id-setup.c b/src/machine-id-setup.c
index 0f9743380..94198cb83 100644
--- a/src/machine-id-setup.c
+++ b/src/machine-id-setup.c
@@ -32,6 +32,7 @@
 #include "machine-id-setup.h"
 #include "macro.h"
 #include "util.h"
+#include "mkdir.h"
 #include "log.h"
 #include "virt.h"
 
@@ -234,28 +235,25 @@ int machine_id_setup(void) {
         fd = -1;
 
         /* Hmm, we couldn't write it? So let's write it to
-         * /run/systemd/machine-id as a replacement */
-
-        mkdir_p("/run/systemd", 0755);
+         * /run/machine-id as a replacement */
 
         m = umask(0022);
-        r = write_one_line_file("/run/systemd/machine-id", id);
+        r = write_one_line_file("/run/machine-id", id);
         umask(m);
 
         if (r < 0) {
-                log_error("Cannot write /run/systemd/machine-id: %s", strerror(-r));
+                log_error("Cannot write /run/machine-id: %s", strerror(-r));
 
-                unlink("/run/systemd/machine-id");
+                unlink("/run/machine-id");
                 goto finish;
         }
 
         /* And now, let's mount it over */
-        r = mount("/run/systemd/machine-id", "/etc/machine-id", "bind", MS_BIND|MS_RDONLY, NULL) < 0 ? -errno : 0;
-        unlink("/run/systemd/machine-id");
-
-        if (r < 0)
+        r = mount("/run/machine-id", "/etc/machine-id", "bind", MS_BIND|MS_RDONLY, NULL) < 0 ? -errno : 0;
+        if (r < 0) {
+                unlink("/run/machine-id");
                 log_error("Failed to mount /etc/machine-id: %s", strerror(-r));
-        else
+        } else
                 log_info("Installed transient /etc/machine-id file.");
 
 finish: