AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-01-20 02:59:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

machine-id: don't delete runtime machine-id, and place it in /run

Browse Source
This commit is contained in:
Lennart Poettering 2012-04-11 12:49:52 +02:00
parent 966a5d37c3
commit 6996295f85
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/machine-id-setup.c
View File

@ -235,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: