=== modified file 'zsh-functions/confz_fs_init' --- zsh-functions/confz_fs_init 2015-12-09 15:42:57 +0000 +++ zsh-functions/confz_fs_init 2015-10-07 07:11:07 +0000 @@ -447,14 +447,12 @@ die "$0: DEFAULT_FS is unset and no 'filesystem' was passed" checkvars label device filesystem - defvar mkfs_opts '' [[ -b ${vars[device]} ]] || \ die "$0: not a block device: ${(qqq)vars[device]}" do_command=( - mkfs -t ${vars[filesystem]} -L ${vars[label]} ${(z)vars[mkfs_opts]} - ${vars[device]} + mkfs -t ${vars[filesystem]} -L ${vars[label]} ${vars[device]} ) local tries blk_out DEVNAME LABEL UUID TYPE SEC_TYPE PARTLABEL PARTUUID @@ -558,7 +556,7 @@ defvar label $vars[lv_name] require logical_volume %device \?vg_name :size :lv_name - require filesystem :device :label :filesystem \?mkfs_opts + require filesystem :device :label :filesystem require fstab :device :mountpoint :filesystem \?opts \?dump \?pass require mounted :device :mountpoint === modified file 'zsh-functions/confz_vserver_init' --- zsh-functions/confz_vserver_init 2015-12-09 15:42:57 +0000 +++ zsh-functions/confz_vserver_init 2015-10-06 11:13:39 +0000 @@ -65,7 +65,7 @@ die "${vars[etcdir]}/vdir is not symlink or missing" fi - require mounted_volume :size \?filesystem \?mkfs_opts \ + require mounted_volume :size \?filesystem \ lv_name=vs_$vars[name] \ label=${${vars[name]}[0,12]} \ mountpoint=$vars[vdir]