machine-id: properly mount transient machine ID read-only

This commit is contained in:
Lennart Poettering 2012-08-13 16:24:30 +02:00
parent b4c59701f8
commit aed5a52577
1 changed files with 6 additions and 2 deletions

View File

@ -226,13 +226,17 @@ int machine_id_setup(void) {
}
/* And now, let's mount it over */
r = mount("/run/machine-id", "/etc/machine-id", "bind", MS_BIND|MS_RDONLY, NULL) < 0 ? -errno : 0;
r = mount("/run/machine-id", "/etc/machine-id", NULL, MS_BIND, 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.");
/* Mark the mount read-only */
mount(NULL, "/etc/machine-id", NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, NULL);
}
finish:
if (fd >= 0)