confz

commit 0f56398d57fc56f518fc1cc5ebb48abe85aa7efb
parent 07a98ca766aedbddf2984e54e8b06ae94b81d5fe
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Thu, 26 Jun 2014 21:29:09 +0200

check the correct filesystem, pass in opts, dump & pass conditionally
Diffstat:
M
zsh-functions/confz_fs_init
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/zsh-functions/confz_fs_init b/zsh-functions/confz_fs_init
@@ -59,7 +59,7 @@ confz_filesystem_check() {
 	fail_reason="no blkid signature found on $vars[device]"
 	[[ -z $blk_out ]] && return 1  # nothing found on the device
 	eval $blk_out
-	[[ $LABEL == ${vars[label]} && $TYPE == xfs ]] && return 0
+	[[ $LABEL == ${vars[label]} && $TYPE == $vars[filesystem] ]] && return 0
 	die "$0: filesystem already present on ${(qqq)vars[device]}!"
 }
 
@@ -130,7 +130,7 @@ confz_mounted_volume_check() {
 
 	require logical_volume %device :vg_name :size :lv_name
 	require filesystem :device :label :filesystem
-	require fstab :device :mountpoint :filesystem :opts :dump :pass
+	require fstab :device :mountpoint :filesystem \?opts \?dump \?pass
 	require mounted :device :mountpoint
 
 	do_command=( true )