=== modified file 'zsh-functions/confz_fs_init' --- zsh-functions/confz_fs_init 2017-02-02 00:49:58 +0000 +++ zsh-functions/confz_fs_init 2016-02-23 13:24:03 +0000 @@ -482,14 +482,10 @@ # put mountpoint for device into /etc/fstab confz_fstab_check() { - checkvars device mountpoint filesystem defvar opts noatime defvar dump 0 - if [[ $vars[filesystem] == xfs ]]; then - defvar pass 0 - else - defvar pass 2 - fi + defvar pass 2 + checkvars device mountpoint filesystem opts local device mountpoint filesystem opts dump pass sed '/^[ \t]*#/d;s/#.*//;s/[ \t]\+/ /g' /etc/fstab | \ @@ -558,10 +554,9 @@ # create LVM2 logical volume, and make sure it's in fstab and mounted confz_mounted_volume_check() { - checkvars mountpoint - defvar lv_name ${${mountpoint//\//_}##_} + checkvars lv_name defvar filesystem xfs - defvar label ${${vars[lv_name]}[1,12]} + defvar label $vars[lv_name] require logical_volume %device \?vg_name :size :lv_name require filesystem :device :label :filesystem \?mkfs_opts