Commit 39c989c6 authored by Elizabeth Myers's avatar Elizabeth Myers Committed by Natanael Copa

main/util-vserver: fix the init script to properly mount the entire cgroups hierarchy.

fixes #853
fixes #852
parent e31de0d3
......@@ -2,7 +2,7 @@
pkgname=util-vserver
pkgver=0.30.216_pre2994
_realver=${pkgver%_*}-${pkgver#*_}
pkgrel=0
pkgrel=1
pkgdesc="Linux-VServer admin utilities"
url="http://www.nongnu.org/util-vserver/"
arch="all"
......@@ -18,6 +18,7 @@ source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_real
validate.patch
alpine.patch
bb-grep.patch
init-script.patch
setup-vs-template
setup-vs-guest
"
......@@ -75,5 +76,6 @@ ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch
da8b70c4fd40e68894b3903ffd121397 validate.patch
04000261fd990a3963b0e98260b481bd alpine.patch
3fc52e20d998f02995f21912738f5d36 bb-grep.patch
6e574535409b3ab0361023f1a7f082eb init-script.patch
fae6626b724dec90a19924d68d355cd2 setup-vs-template
ef35e154d1a221631a53f9c2cfbe9834 setup-vs-guest"
--- util-vserver-0.30.216-pre2994.orig/gentoo/util-vserver
+++ util-vserver-0.30.216-pre2994/gentoo/util-vserver
@@ -58,7 +58,7 @@
$__PKGLIBDIR/bash-wrapper 'hasCgroup'
if [ $? -eq 0 ]; then
ebegin "Mounting cgroup-hierarchy"
- $__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; $_MOUNT -t cgroup -o "$CGROUP_SUBSYS" vserver "$CGROUP_MNT"'
+ $__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; IFS=","; $_MOUNT -t cgroup -o "${CGROUP_SUBSYS[*]}" vserver "$CGROUP_MNT"'
eend $?
fi
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment