From c12c379de8a485d90d8a8ad06ece0753da6ef23d Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Fri, 17 Feb 2012 10:08:31 +0100 Subject: [PATCH] Allow something else to mount the cgroup hierarchy --- scripts/vserver-init.functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/vserver-init.functions b/scripts/vserver-init.functions index 32c65d9..fef3c82 100755 --- a/scripts/vserver-init.functions +++ b/scripts/vserver-init.functions @@ -91,7 +91,8 @@ function mount_cgroup() if test -n "$CGROUP_MNT_PER_SS"; then for ss in "${CGROUP_SUBSYS[@]}"; do $_MKDIR -p "$CGROUP_MNT/$ss" - $_MOUNT -t cgroup -o "$ss" vserver "$CGROUP_MNT/$ss" + $_GREP -q "$CGROUP_MNT/$ss" /proc/mounts || \ + $_MOUNT -t cgroup -o "$ss" vserver "$CGROUP_MNT/$ss" done else oIFS="$IFS" -- 1.8.1.5