Fix test_proc on s390x

[mirror_lxcfs.git] / share / lxc.mount.hook.in

diff --git a/share/lxc.mount.hook.in b/share/lxc.mount.hook.in
index f9cbea0d53b0dc771132208741460c70b42ee76c..8fc4748f77f779c615a26a1e8547f464839f0405 100755 (executable)
--- a/share/lxc.mount.hook.in
+++ b/share/lxc.mount.hook.in
@@ -1,4 +1,7 @@
-#!/bin/sh -eu
+#!/bin/sh -e
+
+# We're dealing with mount entries, so expand any symlink
+LXC_ROOTFS_MOUNT=$(readlink -f ${LXC_ROOTFS_MOUNT})
 
 # /proc files
 if [ -d @LXCFSTARGETDIR@/proc/ ]; then
@@ -8,33 +11,72 @@ if [ -d @LXCFSTARGETDIR@/proc/ ]; then
     done
 fi
 
+
+# Allow nesting lxcfs
+if [ -d ${LXC_ROOTFS_MOUNT}@LXCFSTARGETDIR@/ ]; then
+    mount -n --bind @LXCFSTARGETDIR@ ${LXC_ROOTFS_MOUNT}@LXCFSTARGETDIR@/
+fi
+
+# no need for lxcfs cgroups if we have cgroup namespaces
+[ -n "$LXC_CGNS_AWARE" ] && [ -f /proc/self/ns/cgroup ] && exit 0
+
+# Don't mess with containers that don't have /sys/fs/cgroup configured
+# (lxc.mount.auto = cgroup:mixed)
+if touch ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/lxcfs; then
+    rm ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/lxcfs
+else
+    exit 0
+fi
+
 # /sys/fs/cgroup files
 if [ -d "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup" ]; then
-    mount -n -t tmpfs none ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/ -o size=4k,mode=755
-    if [ -d /sys/fs/cgroup/cgmanager.lower ]; then
-        mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/cgmanager
-        mount -n --bind /sys/fs/cgroup/cgmanager.lower \
-            ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/cgmanager
-    elif [ -d /sys/fs/cgroup/cgmanager ]; then
-        mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/cgmanager
-        mount -n --bind /sys/fs/cgroup/cgmanager \
-            ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/cgmanager
-    fi
-
     if [ -d @LXCFSTARGETDIR@/cgroup ]; then
+        # Cleanup existing mounts
+        for entry in ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/*; do
+            DEST=$(basename $entry)
+
+            if [ "${DEST}" = "cgmanager" ]; then
+                continue
+            fi
+
+            if [ ! -d "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/${DEST}" ]; then
+                continue
+            fi
+
+            while grep -q "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/${DEST}" /proc/self/mountinfo; do
+                grep "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/${DEST}" /proc/self/mountinfo | cut -d' ' -f5 | while read line; do
+                     [ -e "${line}" ] && umount -l "${line}" || true
+                done
+            done
+
+            rm -Rf ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/${DEST}
+        done
+
+        # Mount the new entries
         for entry in @LXCFSTARGETDIR@/cgroup/*; do
             DEST=$(basename $entry)
             if [ "$DEST" = "name=systemd" ]; then
                 DEST="systemd"
             fi
 
-            mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST
+            if [ ! -d ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/${DEST} ]; then
+                mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/${DEST}
+            fi
+
             mount -n --bind $entry ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST
-        done
 
-        if [ -d ${LXC_ROOTFS_MOUNT}@LXCFSTARGETDIR@/ ]; then
-            mount -n --bind @LXCFSTARGETDIR@ ${LXC_ROOTFS_MOUNT}@LXCFSTARGETDIR@/
-        fi
+            # make sure that cpu,cpuacct shows up as cpu and cpuacct
+            # separately, else systemd is unhappy
+            if echo $DEST | grep -q ","; then
+                arr=$(echo $DEST | tr "," "\n")
+                for single in $arr
+                do
+                    if [ ! -L ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$single ]; then
+                        ln -s $DEST ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$single
+                    fi
+                done
+            fi
+        done
     fi
 fi