X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sysv%2Futil-vserver;h=84636ba92ecea69c63fccd916ce8fdc7235554a9;hb=6218a85294eaebd9c2a0b57f2d7c5f086a3a129c;hp=047ef45dd70eb8e3de50d350a0f5547e332da42d;hpb=82a9b690cda21ee4545b8a60b6473eaafde73e9b;p=util-vserver.git diff --git a/sysv/util-vserver b/sysv/util-vserver index 047ef45..84636ba 100755 --- a/sysv/util-vserver +++ b/sysv/util-vserver @@ -14,6 +14,8 @@ test -e "$UTIL_VSERVER_VARS" || { LOCKFILE=util-vserver . "$_LIB_VSERVER_INIT_FUNCTIONS" +. "$_LIB_FUNCTIONS" +. "$__PKGLIBDIR/vserver.functions" function set_helper() @@ -51,6 +53,9 @@ function start() set_helper _endResult $? local retval=$? + _beginResult $"Loading default device map" + loadDeviceMap 0 "$__CONFDIR/.defaults/apps/vdevmap" + _endResult $? test "$retval" -ne 0 || touch "$lockfile" return $retval } @@ -61,11 +66,12 @@ function stop() _beginResult $"Stopping all running guests" $_START_VSERVERS -j 1 --all --stop _endResult $? - local retval=$? _beginResult $"Killing all running contexts" kill_contexts _endResult $? + local retval=$? $_RM -f "$lockfile" + return $retval } function restart() @@ -82,10 +88,10 @@ case "$1" in ;; status) test -f $lockfile && { - echo $"/proc entries were fixed" + echo $"Path to vshelper has been set" exit 0 } - echo $"/proc entries are not fixed" + echo $"Path to vshelper has not been set" exit 1 ;; *)