X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine-id-setup.c;h=59a14249e448381e36ceaad10d7bacf403823d91;hp=65792e9b842357b2f0b87e1f08403a64a094ddb4;hb=b925e72633bf98438f56a140520e07ec8c959e46;hpb=29d958ce2ba49794fa92dd77b2f9a9bdc941f493 diff --git a/src/machine-id-setup.c b/src/machine-id-setup.c index 65792e9b8..59a14249e 100644 --- a/src/machine-id-setup.c +++ b/src/machine-id-setup.c @@ -142,20 +142,20 @@ int machine_id_setup(void) { fd = -1; /* Hmm, we couldn't write it? So let's write it to - * /dev/.systemd/machine-id as a replacement */ + * /dev/.run/systemd/machine-id as a replacement */ - mkdir_p("/dev/.systemd", 0755); + mkdir_p("/dev/.run/systemd", 0755); - if ((r = write_one_line_file("/dev/.systemd/machine-id", id)) < 0) { - log_error("Cannot write /dev/.systemd/machine-id: %s", strerror(-r)); + if ((r = write_one_line_file("/dev/.run/systemd/machine-id", id)) < 0) { + log_error("Cannot write /dev/.run/systemd/machine-id: %s", strerror(-r)); - unlink("/dev/.systemd/machine-id"); + unlink("/dev/.run/systemd/machine-id"); goto finish; } /* And now, let's mount it over */ - r = mount("/dev/.systemd/machine-id", "/etc/machine-id", "bind", MS_BIND|MS_RDONLY, NULL) < 0 ? -errno : 0; - unlink("/dev/.systemd/machine-id"); + r = mount("/dev/.run/systemd/machine-id", "/etc/machine-id", "bind", MS_BIND|MS_RDONLY, NULL) < 0 ? -errno : 0; + unlink("/dev/.run/systemd/machine-id"); if (r < 0) log_error("Failed to mount /etc/machine-id: %s", strerror(-r));