=== modified file 'zsh-functions/confz_fs_init' --- zsh-functions/confz_fs_init 2019-02-13 09:28:10 +0000 +++ zsh-functions/confz_fs_init 2019-02-13 07:55:05 +0000 @@ -681,15 +681,11 @@ defvar lv_name ${${${vars[mountpoint]}##/}//\//_} defvar filesystem xfs defvar label ${${vars[lv_name]}[1,12]} - defvar root / - [[ $mountpoint == /* ]] || \\ - die "$0: mountpoint must be absolute path, got: ${(qqq)mountpoint}" require logical_volume %device \?vg_name :size :lv_name require filesystem :device :label :filesystem \?mkfs_opts - require fstab fstab=${vars[root]%/}/etc/fstab \ - :device :mountpoint :filesystem \?opts \?dump \?pass - require mounted :device mountpoint=${vars[root]%/}/${vars[mountpoint]#/} + require fstab :device :mountpoint :filesystem \?opts \?dump \?pass + require mounted :device :mountpoint do_command=( true ) } === modified file 'zsh-functions/confz_vserver_init' --- zsh-functions/confz_vserver_init 2019-02-13 09:28:10 +0000 +++ zsh-functions/confz_vserver_init 2018-02-02 13:45:29 +0000 @@ -83,10 +83,9 @@ # configure and deploy vserver confz_vserver_check() { checkvars name size context_id source - defvar root / - setvar etcdir ${vars[root]%/}/etc/vservers/${vars[name]} - setvar vdir ${vars[root]%/}/vservers/${vars[name]} + setvar etcdir /etc/vservers/${vars[name]} + setvar vdir /vservers/${vars[name]} local ctx ret local -a fails @@ -98,7 +97,7 @@ fi else fails+=( "${vars[etcdir]}/context) missing" ) - for ctx in ${vars[root]%/}/etc/vservers/*/context(N); do + for ctx in /etc/vservers/*/context(N); do if [[ $(<$ctx) == ${vars[context_id]} ]]; then die "$0: context id already used by $ctx" fi @@ -115,7 +114,7 @@ label=${${vars[name]}[0,12]} \ mountpoint=$vars[vdir] - require deployed_system :root :source path=${vars[vdir]} + require deployed_system :source path=${vars[vdir]} fail_reason="${(j:,:)fails}" return $#fails