X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gentoo%2Futil-vserver;h=3c49ce0dd493821abad1d8e153ef228539e679ce;hb=b611393a98072ffa745720ce3c1e7b3d1f851e07;hp=715b84c74b5c7c92569e7578cb939861ebfbcb33;hpb=81b438ba5510581d95fc5daa253743143f50544b;p=util-vserver.git diff --git a/gentoo/util-vserver b/gentoo/util-vserver index 715b84c..3c49ce0 100644 --- a/gentoo/util-vserver +++ b/gentoo/util-vserver @@ -2,66 +2,45 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -set_helper() { - local f="/proc/sys/kernel/vshelper" - if [ -e "$f" ]; then - echo "$_VSHELPER" > "$f" - fi - return 0 -} - -kill_contexts() { - local xid - for xid in `ls -1 /proc/virtual`; do - [ "$xid" = "info" -o "$xid" = "status" ] && continue - $_VATTRIBUTE --xid $xid --set --flag ~persistent - $_VKILL --xid $xid -s 15 - sleep 3 - $_VKILL --xid $xid -s 9 - done - local alive=0 - for xid in `ls -1 /proc/virtual`; do - [ "$xid" = "info" -o "$xid" = "status" ] && continue - let alive+=1 - done - return $alive -} - start() { : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} - if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then + if [ ! -e ${UTIL_VSERVER_VARS} ]; then eerror "Cannot find util-vserver installation" eerror "(the file '$UTIL_VSERVER_VARS' would be expected)" return 1 fi - source ${UTIL_VSERVER_VARS} + . ${UTIL_VSERVER_VARS} + + ebegin "Creating directories for $PACKAGE_NAME" + $__PKGLIBDIR/bash-wrapper 'create_dirs' + eend $? ebegin "Setting vshelper path to $_VSHELPER" - set_helper + $__PKGLIBDIR/bash-wrapper 'set_helper' eend $? ebegin "Loading default device map" - $__PKGLIBDIR/bash-wrapper 'loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap"' + $__PKGLIBDIR/bash-wrapper 'handleDeviceMap --set 0 "$__CONFDIR/.defaults/apps/vdevmap"' eend $? } stop() { : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} - if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then + if [ ! -e ${UTIL_VSERVER_VARS} ]; then eerror "Cannot find util-vserver installation" eerror "(the file '$UTIL_VSERVER_VARS' would be expected)" return 1 fi - source ${UTIL_VSERVER_VARS} + . ${UTIL_VSERVER_VARS} ebegin "Stopping all running guests" $_START_VSERVERS -j 1 --all --stop eend $? ebegin "Killing all running contexts" - kill_contexts + $__PKGLIBDIR/bash-wrapper 'kill_contexts' eend $? }