diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-30 16:33:55 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-31 14:32:48 -0400 |
| commit | 10d18763ec6f31ded1535f810be765f7fab2d97d (patch) | |
| tree | 43fc104c5c59ee97687f338e1c6cc86b5a641cae | |
| parent | d73c3269cd3c92bb26f5e161516c587f2874c8c5 (diff) | |
nspawn, machine-id-setup: warn if read-only mount call fails
They are not crucial, but they shouldn't fail.
| -rw-r--r-- | src/core/machine-id-setup.c | 4 | ||||
| -rw-r--r-- | src/nspawn/nspawn.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index ca163978f3..146c5653c9 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -235,7 +235,9 @@ int machine_id_setup(void) { 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); + if (mount(NULL, "/etc/machine-id", NULL, + MS_BIND|MS_RDONLY|MS_REMOUNT, NULL) < 0) + log_warning("Failed to make transient /etc/machine-id read-only"); } finish: diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 9268cbc246..b8b692b474 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -537,8 +537,8 @@ static int setup_boot_id(const char *dest) { if (mount(from, to, "bind", MS_BIND, NULL) < 0) { log_error("Failed to bind mount boot id: %m"); r = -errno; - } else - mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); + } else if (mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL)) + log_warning("Failed to make boot id read-only: %m"); unlink(from); return r; |