=== modified file 'bin/confz' --- bin/confz 2014-06-24 21:39:56 +0000 +++ bin/confz 2014-06-24 14:30:42 +0000 @@ -3,7 +3,7 @@ autoload -Uz colors; colors -setopt extended_glob warn_create_global no_unset +setopt extended_glob warn_create_global typeset -gA vars vars_prev typeset -ga do_command === removed directory 'sbin' === removed file 'sbin/vserver-listconfigs' --- sbin/vserver-listconfigs 2014-06-24 21:39:56 +0000 +++ sbin/vserver-listconfigs 1970-01-01 00:00:00 +0000 @@ -1,20 +0,0 @@ -#!/bin/zsh -# vim: ft=zsh noet ts=4 sts=4 sw=4 - -setopt extended_glob warn_create_global no_unset - -die() { - print -r - "$@" >&2 - exit 1 -} - -vserver_name=${1:-${${PWD#/etc/vservers/}:h}} - -[[ -e /etc/vservers/$vserver_name ]] || \ - die "could not determine vserver name" - -vdir=/etc/vservers/$vserver_name/vdir -vdir=$vdir:A - -print -rl - >/var/run/vservers/$vserver_name.files /etc/vservers/**/*(.) -grep >/var/run/vservers/$vserver_name.mtab '^[^ ]* '$vdir'[/ ]' /etc/mtab === modified file 'zsh-functions/confz_vserver_init' --- zsh-functions/confz_vserver_init 2014-06-24 21:39:56 +0000 +++ zsh-functions/confz_vserver_init 2014-06-19 19:23:02 +0000 @@ -4,8 +4,6 @@ # confz functions for deploying vservers # -# load the zstat builtin and keep stat external -zmodload -F zsh/stat b:zstat # deploy filesystem image from directory, rsync or tarball confz_deployed_system_check() { @@ -55,10 +53,10 @@ require mounted_volume :size :filesystem \ lv_name=vs_$vars[name] \ label=$vars[name] \ - mountpoint=$vars[vdir] + mountpoint=$vars[vdir] require deployed_system :source path=${vars[vdir]} - + fail_reason="${(j:,:)fails}" return $#fails } @@ -71,38 +69,3 @@ ln -s $vars[vdir] ${vars[etcdir]}/vdir || return $? print -r - ${vars[context_id]} >${vars[etcdir]}/context } - -confz_vserver_started_check() { - checkvars name - do_command=( vserver -- $vars[name] start ) - vserver --silent -- $vars[name] running || return $? - local context_id - context_id=$(