summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElizabeth J. Myers <elizabeth@sporksmoo.net>2011-12-03 14:35:54 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2011-12-03 14:48:22 -0600
commit34cebe26cb9f4b181fdb0b33adb8b842ea9d66e0 (patch)
tree33d8cb0cfcba95baa7140763f53ddf80a3364dad
parent1300bc42740a954a6c30d5f71c1240c214d6aa3d (diff)
downloadaports-34cebe26cb9f4b181fdb0b33adb8b842ea9d66e0.tar.bz2
aports-34cebe26cb9f4b181fdb0b33adb8b842ea9d66e0.tar.xz
main/util-vserver: fix the init script to properly mount the entire cgroups hierarchy.
fix #853
-rw-r--r--main/util-vserver/APKBUILD4
-rw-r--r--main/util-vserver/init-script.patch11
2 files changed, 14 insertions, 1 deletions
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD
index e4cfe4367..e1dbeec16 100644
--- a/main/util-vserver/APKBUILD
+++ b/main/util-vserver/APKBUILD
@@ -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"
diff --git a/main/util-vserver/init-script.patch b/main/util-vserver/init-script.patch
new file mode 100644
index 000000000..2bfd40a9a
--- /dev/null
+++ b/main/util-vserver/init-script.patch
@@ -0,0 +1,11 @@
+--- 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
+ }