X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sysv%2Futil-vserver;h=4f7f035a7cdc0cbcdd4cc26d3d2b6b3c765d585d;hb=28f2941c7781b494b9a47d71d56317b2ee8940d6;hp=d56dadc07c7c5c2bc5bd2288b0b51938b06e7e23;hpb=90ceb7b399cf3c1eb8d0c7474bd2498fe62cd022;p=util-vserver.git diff --git a/sysv/util-vserver b/sysv/util-vserver index d56dadc..4f7f035 100755 --- a/sysv/util-vserver +++ b/sysv/util-vserver @@ -32,7 +32,7 @@ function set_helper() function kill_contexts() { local xid - for xid in `ls -1 /proc/virtual`; do + for xid in `ls -1 /proc/virtual 2>/dev/null`; do test "$xid" = "info" -o "$xid" = "status" && continue $_VATTRIBUTE --xid $xid --set --flag ~persistent $_VKILL --xid $xid -s 15 @@ -40,7 +40,7 @@ function kill_contexts() $_VKILL --xid $xid -s 9 done local alive=0 - for xid in `ls -1 /proc/virtual`; do + for xid in `ls -1 /proc/virtual 2>/dev/null`; do test "$xid" = "info" -o "$xid" = "status" && continue let alive+=1 done @@ -52,6 +52,14 @@ function create_dirs() $_MKDIR -p "$__RUNDIR" && $_MKDIR -p "$__VSHELPERSTATEDIR" && $_MKDIR -p `$_READLINK "$__PKGSTATEREVDIR"` } +function mount_cgroup() +{ + _generateCgroupOptions + test -n "$CGROUP_MNT" || return 0 + $_MKDIR -p "$CGROUP_MNT" + $_MOUNT -t cgroup -o "$CGROUP_SUBSYS" vserver "$CGROUP_MNT" +} + function start() { _beginResult $"Creating required directories" @@ -64,6 +72,11 @@ function start() _beginResult $"Loading default device map" handleDeviceMap --set 0 "$__CONFDIR/.defaults/apps/vdevmap" _endResult $? + if hasCgroup; then + _beginResult $"Mounting cgroup-hierarchy" + mount_cgroup + _endResult $? + fi test "$retval" -ne 0 || touch "$lockfile" return $retval }