chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id: properly mount transient machine ID read-only
[elogind.git]
/
src
/
core
/
machine-id-setup.c
diff --git
a/src/core/machine-id-setup.c
b/src/core/machine-id-setup.c
index 636519c00c81d7d17b41fc675642fd114bbac3f5..7f4c23b13004c2beffb546e097c1fd5e1462fa24 100644
(file)
--- a/
src/core/machine-id-setup.c
+++ b/
src/core/machine-id-setup.c
@@
-100,7
+100,7
@@
static int generate(char id[34]) {
if (k >= 36) {
r = shorten_uuid(id, uuid);
if (r >= 0) {
if (k >= 36) {
r = shorten_uuid(id, uuid);
if (r >= 0) {
- log_info("Initializing machine ID from KVM UUID");
+ log_info("Initializing machine ID from KVM UUID
.
");
return 0;
}
}
return 0;
}
}
@@
-119,7
+119,7
@@
static int generate(char id[34]) {
if (strlen(e) >= 36) {
r = shorten_uuid(id, e);
if (r >= 0) {
if (strlen(e) >= 36) {
r = shorten_uuid(id, e);
if (r >= 0) {
- log_info("Initializing machine ID from container UUID");
+ log_info("Initializing machine ID from container UUID
.
");
free(e);
return 0;
}
free(e);
return 0;
}
@@
-226,13
+226,17
@@
int machine_id_setup(void) {
}
/* And now, let's mount it over */
}
/* 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));
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.");
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)
finish:
if (fd >= 0)