X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmount-setup.c;h=be11bb8f369a1a18741ad0adaf281cd3c42d9f02;hp=c26dedca60a466b5fc24f0bff5440565ba6c42d2;hb=8f0e73f250f4a397ea07d29a339bd7e64d077612;hpb=d2e54fae5ca7a0f71b5ac8b356a589ff0a09ea0a

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index c26dedca6..be11bb8f3 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -39,6 +39,7 @@
 #include "strv.h"
 #include "mkdir.h"
 #include "path-util.h"
+#include "missing.h"
 
 #ifndef TTY_GID
 #define TTY_GID 5
@@ -120,7 +121,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
 
         /* Relabel first, just in case */
         if (relabel)
-                label_fix(p->where, true);
+                label_fix(p->where, true, true);
 
         if ((r = path_is_mount_point(p->where, true)) < 0)
                 return r;
@@ -149,7 +150,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
 
         /* Relabel again, since we now mounted something fresh here */
         if (relabel)
-                label_fix(p->where, false);
+                label_fix(p->where, false, false);
 
         return 1;
 }
@@ -189,8 +190,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
 
         controllers = set_new(string_hash_func, string_compare_func);
         if (!controllers) {
-                r = -ENOMEM;
-                log_error("Failed to allocate controller set.");
+                r = log_oom();
                 goto finish;
         }
 
@@ -261,9 +261,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
 
                         options = strv_join(*k, ",");
                         if (!options) {
-                                log_error("Failed to join options");
                                 free(controller);
-                                r = -ENOMEM;
+                                r = log_oom();
                                 goto finish;
                         }
 
@@ -274,9 +273,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
 
                 where = strappend("/sys/fs/cgroup/", options);
                 if (!where) {
-                        log_error("Failed to build path");
                         free(options);
-                        r = -ENOMEM;
+                        r = log_oom();
                         goto finish;
                 }
 
@@ -305,8 +303,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
 
                                 t = strappend("/sys/fs/cgroup/", *i);
                                 if (!t) {
-                                        log_error("Failed to build path");
-                                        r = -ENOMEM;
+                                        r = log_oom();
                                         free(options);
                                         goto finish;
                                 }
@@ -346,7 +343,7 @@ static int nftw_cb(
         if (_unlikely_(ftwbuf->level == 0))
                 return FTW_CONTINUE;
 
-        label_fix(fpath, true);
+        label_fix(fpath, false, false);
 
         /* /run/initramfs is static data and big, no need to
          * dynamically relabel its contents at boot... */
@@ -390,7 +387,7 @@ int mount_setup(bool loaded_policy) {
 
                 /* Explicitly relabel these */
                 NULSTR_FOREACH(j, relabel)
-                        label_fix(j, true);
+                        label_fix(j, true, false);
 
                 after_relabel = now(CLOCK_MONOTONIC);
 
@@ -401,7 +398,16 @@ int mount_setup(bool loaded_policy) {
         /* Create a few default symlinks, which are normally created
          * by udevd, but some scripts might need them before we start
          * udevd. */
-        dev_setup();
+        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);