lxc mount hook: don't mount lxcfs fs for any controller already setup

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/share/lxc.mount.hook.in b/share/lxc.mount.hook.in
index c8916ef1598f71ed6dee221279502de373e98f48..aa54161f1375f1bae0631a04eb90f5df5e8396d1 100755 (executable)
--- a/share/lxc.mount.hook.in
+++ b/share/lxc.mount.hook.in
@@ -26,6 +26,9 @@ if [ -d "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup" ]; then
                 DEST="systemd"
             fi
 
+            if mountpoint -q ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST; then
+                continue
+            fi
             mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST
             mount -n --bind $entry ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST
         done