=== modified file 'zsh-functions/confz_fs_init' --- zsh-functions/confz_fs_init 2014-06-19 17:55:17 +0000 +++ zsh-functions/confz_fs_init 2014-06-19 17:48:04 +0000 @@ -122,8 +122,9 @@ # create LVM2 logical volume, and make sure it's in fstab and mounted confz_mounted_volume_check() { - checkvars lv_name label + checkvars lv_name opts label defvar filesystem xfs + defvar opts noatime defvar label $vars[lv_name] require logical_volume %device :vg_name :size :lv_name === modified file 'zsh-functions/confz_vserver_init' --- zsh-functions/confz_vserver_init 2014-06-19 17:55:17 +0000 +++ zsh-functions/confz_vserver_init 2014-06-19 17:46:31 +0000 @@ -7,7 +7,11 @@ # deploy filesystem image from directory, rsync or tarball confz_deployed_system_check() { - checkvars path source + [[ -n ${vars[path]} ]] || \ + die "$0: no 'path' was passed" + + [[ -n ${vars[source]} ]] || \ + die "$0: no 'source' was passed" if [[ ${vars[source]} == */ ]]; then do_command=( rsync -aAH ${vars[source]} ${vars[path]}/ ) @@ -22,7 +26,17 @@ # configure and deploy vserver confz_vserver_check() { - checkvars name size context_id source + [[ -n ${vars[name]} ]] || \ + die "$0: no 'name' was passed" + + [[ -n ${vars[size]} ]] || \ + die "$0: no 'size' was passed" + + [[ -n ${vars[context_id]} ]] || \ + die "$0: no 'context_id' was passed" + + [[ -n ${vars[source]} ]] || \ + die "$0: no 'source' was passed" setvar etcdir /etc/vservers/${vars[name]} setvar vdir /vservers/${vars[name]}