Skip to content

Commit

Permalink
mount-setup: change system mount propagation to shared by default
Browse files Browse the repository at this point in the history
In order to make containers work nicely out of the box it is highly
desirable to have the mount propagation mode for the root fs is set as
"shared" by default so that containers receive system mounts by default.
(See mount --make-shared for more information).

As it is unlikely that the kernel will change the default to "shared"
for this, do this early at boot-up from PID 1. Setups which prefer the
default of "private" should undo this change via invoking "mount
--make-private /" or a similar command after boot.

In the long run /etc/fstab should take the propagation mode as a mount
option like any other, so that this may be used to change the default
mode. However, if fstab is not around or doesn't list / we still should
default to shared as propagation mode, hence this change now.
  • Loading branch information
poettering committed Aug 6, 2012
1 parent 86fc77c commit b3ac5f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 0 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ Features:

* .journal~ files should be parsed too

* use mount --make-shared on / by default

* allow services with no ExecStart= but with an ExecStop=

* add proper journal support to "systemctl --user status ..."
Expand Down
9 changes: 9 additions & 0 deletions src/core/mount-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,15 @@ int mount_setup(bool loaded_policy) {
* udevd. */
dev_setup();

/* Mark the root directory as shared in regards to mount
* propagation. The kernel defaults to "private", but we think
* it makes more sense to have a default of "shared" so that
* nspawn and the container tools work out of the box. If
* specific setups need other settings they can reset the
* propagation mode to private if needed. */
if (mount(NULL, "/", NULL, MS_REC|MS_SHARED, NULL) < 0)
log_warning("Failed to set up the root directory for shared mount propagation: %m");

/* Create a few directories we always want around */
mkdir_label("/run/systemd", 0755);
mkdir_label("/run/systemd/system", 0755);
Expand Down

0 comments on commit b3ac5f8

Please sign in to comment.