lxc mount hook: implement stgraber's suggestions

revert to using sh and use symlinks instead of extra mounts.

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

diff --git a/share/lxc.mount.hook.in b/share/lxc.mount.hook.in
index 4c4645210c058eea97fff85f7904feae0e27e20a..fb6572191ecf2be422e251494a8ce395d13c4661 100755 (executable)
--- a/share/lxc.mount.hook.in
+++ b/share/lxc.mount.hook.in
@@ -1,4 +1,4 @@
-#!/bin/bash -eu
+#!/bin/sh -eu
 
 # Don't mess with containers that don't have /sys/fs/cgroup configured
 # (lxc.mount.auto = cgroup:mixed)
@@ -34,12 +34,11 @@ if [ -d "${LXC_ROOTFS_MOUNT}/sys/fs/cgroup" ]; then
 
             # make sure that cpu,cpuacct shows up as cpu and cpuacct
             # separately, else systemd is unhappy
-            if [[ $DEST == *,* ]]; then
+            if echo $DEST | grep -q ","; then
                 arr=$(echo $DEST | tr "," "\n")
                 for single in $arr
                 do
-                    mkdir ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$single
-                    mount -n --bind $entry ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$single
+                    ln -s ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$DEST ${LXC_ROOTFS_MOUNT}/sys/fs/cgroup/$single
                 done
             fi
         done