confz

commit de3513eca97749c8678a7f533a3b66dfcf082b6d
parent c7033116234f5cd573b6d872525673bd6b4872b9
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Thu, 19 Jun 2014 18:38:26 +0200

pass lv_name correctly, fix trace printing
Diffstat:
M
bin/confz
 | 
12
++++++------
M
zsh-functions/confz_vserver_init
 | 
3
++-

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/bin/confz b/bin/confz
@@ -14,13 +14,13 @@ die() {
 	print -r - ${(p)confz_err_mark} "$@" >&2
 	exit 1
 }
-confz_err_mark="%F[red]*%f"
+confz_err_mark="%F{red}*%f"
 
 # trace-printing helpers
-confz_exe_mark="%F[yellow]*%f"
+confz_exe_mark="%F{yellow}*%f"
 
 confz_check_start() {
-	print -Pn "${indent}checking %B$1%b "
+	print -Pn "${confz_indent}checking %B$1%b "
 	print -rn - ${(@q)argv[2,-1]}
 	print -P " ["
 	confz_indent+=" "
@@ -28,16 +28,16 @@ confz_check_start() {
 
 confz_check_ok() {
 	confz_indent=${confz_indent% }
-	print -P "$indent] %F[green]$1%f OK"
+	print -P "$confz_indent] %F{green}$1%f OK"
 }
 
 confz_check_fail() {
 	confz_indent=${confz_indent% }
-	print -P "$indent] %F[yellow]$1%f FAIL"
+	print -P "$indent] %F{yellow}$1%f FAIL"
 }
 
 confz_do() {
-	print -r - $indent${(p)confz_exe_mark} "${(q)@}"
+	print -r - $confz_indent${(p)confz_exe_mark} "${(q)@}"
 	"$@" || die "command failed with error $?: ${(q)@}"
 }
 
diff --git a/zsh-functions/confz_vserver_init b/zsh-functions/confz_vserver_init
@@ -59,7 +59,8 @@ confz_vserver_check() {
 	fi
 	[[ -h ${vars[etcdir]}/vdir ]] || ret=1
 
-	require mounted_volume :name :size :filesystem mountpoint=${vars[vdir]} 
+	require mounted_volume :size :filesystem \
+		lv_name=${vars[name]} mountpoint=${vars[vdir]} 
 	require deployed_system :source path=${vars[vdir]}
 	
 	return $ret