X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount-setup.c;h=e45a6bc1c889821547d3c324ea1f395dc8651423;hb=4e6db59202ad2dbbef56a69985643390ffdd57bd;hp=6140f56d831ba5ee4b0c2c0d0c3eca6cb4645b43;hpb=c17ec25e4d9bd6c8e8617416f813e25b2ebbafc5;p=elogind.git

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 6140f56d8..e45a6bc1c 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -315,6 +315,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
                 p.type = "cgroup";
                 p.options = options;
                 p.flags = MS_NOSUID|MS_NOEXEC|MS_NODEV;
+                p.mode = MNT_IN_CONTAINER;
 
                 r = mount_one(&p, true);
                 free(controller);
@@ -422,7 +423,7 @@ int mount_setup(bool loaded_policy) {
                 after_relabel = now(CLOCK_MONOTONIC);
 
                 log_info("Relabelled /dev and /run in %s.",
-                         format_timespan(timespan, sizeof(timespan), after_relabel - before_relabel));
+                         format_timespan(timespan, sizeof(timespan), after_relabel - before_relabel, 0));
         }
 
         /* Create a few default symlinks, which are normally created