diff options
author | Elizabeth J. Myers <elizabeth@sporksmoo.net> | 2011-12-03 14:35:54 -0600 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-12-22 15:30:08 +0000 |
commit | 39c989c6ec470db3340e857ee7f42379de15c222 (patch) | |
tree | 0f3c04ec0e413676f10f509fbe6c775c7c46090c | |
parent | e31de0d33d237461e35bfecf9909f260bab17a4e (diff) | |
download | alpine_aports-39c989c6ec470db3340e857ee7f42379de15c222.tar.bz2 alpine_aports-39c989c6ec470db3340e857ee7f42379de15c222.tar.xz alpine_aports-39c989c6ec470db3340e857ee7f42379de15c222.zip |
main/util-vserver: fix the init script to properly mount the entire cgroups hierarchy.
fixes #853
fixes #852
-rw-r--r-- | main/util-vserver/APKBUILD | 4 | ||||
-rw-r--r-- | main/util-vserver/init-script.patch | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index e4cfe43674..e1dbeec168 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | pkgname=util-vserver | 2 | pkgname=util-vserver |
3 | pkgver=0.30.216_pre2994 | 3 | pkgver=0.30.216_pre2994 |
4 | _realver=${pkgver%_*}-${pkgver#*_} | 4 | _realver=${pkgver%_*}-${pkgver#*_} |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="Linux-VServer admin utilities" | 6 | pkgdesc="Linux-VServer admin utilities" |
7 | url="http://www.nongnu.org/util-vserver/" | 7 | url="http://www.nongnu.org/util-vserver/" |
8 | arch="all" | 8 | arch="all" |
@@ -18,6 +18,7 @@ source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_real | |||
18 | validate.patch | 18 | validate.patch |
19 | alpine.patch | 19 | alpine.patch |
20 | bb-grep.patch | 20 | bb-grep.patch |
21 | init-script.patch | ||
21 | setup-vs-template | 22 | setup-vs-template |
22 | setup-vs-guest | 23 | setup-vs-guest |
23 | " | 24 | " |
@@ -75,5 +76,6 @@ ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch | |||
75 | da8b70c4fd40e68894b3903ffd121397 validate.patch | 76 | da8b70c4fd40e68894b3903ffd121397 validate.patch |
76 | 04000261fd990a3963b0e98260b481bd alpine.patch | 77 | 04000261fd990a3963b0e98260b481bd alpine.patch |
77 | 3fc52e20d998f02995f21912738f5d36 bb-grep.patch | 78 | 3fc52e20d998f02995f21912738f5d36 bb-grep.patch |
79 | 6e574535409b3ab0361023f1a7f082eb init-script.patch | ||
78 | fae6626b724dec90a19924d68d355cd2 setup-vs-template | 80 | fae6626b724dec90a19924d68d355cd2 setup-vs-template |
79 | ef35e154d1a221631a53f9c2cfbe9834 setup-vs-guest" | 81 | 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 0000000000..2bfd40a9a4 --- /dev/null +++ b/main/util-vserver/init-script.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- util-vserver-0.30.216-pre2994.orig/gentoo/util-vserver | ||
2 | +++ util-vserver-0.30.216-pre2994/gentoo/util-vserver | ||
3 | @@ -58,7 +58,7 @@ | ||
4 | $__PKGLIBDIR/bash-wrapper 'hasCgroup' | ||
5 | if [ $? -eq 0 ]; then | ||
6 | ebegin "Mounting cgroup-hierarchy" | ||
7 | - $__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; $_MOUNT -t cgroup -o "$CGROUP_SUBSYS" vserver "$CGROUP_MNT"' | ||
8 | + $__PKGLIBDIR/bash-wrapper '_generateCgroupOptions; test -n "$CGROUP_MNT" || exit 0; $_MKDIR -p "$CGROUP_MNT"; IFS=","; $_MOUNT -t cgroup -o "${CGROUP_SUBSYS[*]}" vserver "$CGROUP_MNT"' | ||
9 | eend $? | ||
10 | fi | ||
11 | } | ||