commit 13c6836f3a3296ff5547e446691c5fec5d5723fb parent fe231654990ab353cdc49843b4817b0fcd486d30 Author: Jan Pobrislo <ccx@webprojekty.cz> Date: Mon, 20 Apr 2015 14:39:30 +0200 rework how preceding partitions are checked Diffstat:
| M | zsh-functions/confz_fs_init | | | 12 | +++++++----- |
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/zsh-functions/confz_fs_init b/zsh-functions/confz_fs_init @@ -73,13 +73,15 @@ confz_primary_partition_check() { fs_parted_list $vars[device] (( $+vars[size] || $+vars[end] )) || die "$0: requires either size or end" if [[ $vars[number] != 1 ]]; then - (( $+fs_parted_start[$vars[number]-1] )) || \ - die "$0: missing preceding partition" + local prev + prev=$[ $vars[number] - 1 ] + (( $+fs_parted_start[$prev] )) || die "$0: missing preceding partition" + : ${vars[start]:=${fs_parted_start[$prev]}} + else + checkvars start fi - [[ -n ${vars[start]:=${fs_parted_start[$vars[number]-1]:-}} ]] || \ - die "$0: start not specified and no preceding partition" if ! (($+vars[end])); then - vars[end]=$[$vars[start]+$vars[size]] + vars[end]=$[${${vars[start]}%s} + ${${vars[size]}%s}] fi if (( $+fs_parted_start[$vars[number]] )); then return 0