X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sysv%2Futil-vserver;h=0f5dd6c75c42d9b7f3124962a7838eca403bbe14;hb=4db12f3b28c20f8b013c27c6cf0fbae5b336732f;hp=047ef45dd70eb8e3de50d350a0f5547e332da42d;hpb=82a9b690cda21ee4545b8a60b6473eaafde73e9b;p=util-vserver.git diff --git a/sysv/util-vserver b/sysv/util-vserver index 047ef45..0f5dd6c 100755 --- a/sysv/util-vserver +++ b/sysv/util-vserver @@ -4,6 +4,16 @@ # # chkconfig: 2345 10 90 # description: Sets the path to vshelper and kills all guest processes +# +### BEGIN INIT INFO +# Provides: util-vserver +# Required-Start: $remote_fs $syslog $time +# Required-Stop: $remote_fs $syslog $time +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Sets the path to vshelper and kills all guest processes +# Description: Sets the path to vshelper and kills all guest processes +### END INIT INFO : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { @@ -14,6 +24,8 @@ test -e "$UTIL_VSERVER_VARS" || { LOCKFILE=util-vserver . "$_LIB_VSERVER_INIT_FUNCTIONS" +. "$_LIB_FUNCTIONS" +. "$__PKGLIBDIR/vserver.functions" function set_helper() @@ -30,27 +42,58 @@ function set_helper() function kill_contexts() { local xid - for xid in `ls -1 /proc/virtual`; do - test "$xid" = "info" -o "$xid" = "status" && continue + for xid in `ls -1 /proc/virtual 2>/dev/null`; 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 - test "$xid" = "info" -o "$xid" = "status" && continue + for xid in `ls -1 /proc/virtual 2>/dev/null`; do + [ "$xid" = "info" -o "$xid" = "status" ] && continue let alive+=1 done test $alive = 0 } +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 umount_cgroup() +{ + _generateCgroupOptions + test -n "$CGROUP_MNT" || return 0 + $_UMOUNT "$CGROUP_MNT" +} + function start() { + _beginResult $"Creating required directories" + create_dirs + _endResult $? _beginResult $"Setting path to vshelper" set_helper _endResult $? local retval=$? + _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 } @@ -61,11 +104,17 @@ 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=$? + if hasCgroup; then + _beginResult $"Unmounting cgroup-hierarchy" + umount_cgroup + _endResult $? + fi $_RM -f "$lockfile" + return $retval } function restart() @@ -82,10 +131,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 ;; *)