=== modified file 'zsh-functions/confz_fs_init' --- zsh-functions/confz_fs_init 2015-04-20 12:12:40 +0000 +++ zsh-functions/confz_fs_init 2014-10-28 13:37:48 +0000 @@ -65,31 +65,6 @@ } -# check for primary partition -confz_primary_partition_check() { - checkvars device number - defvar fs ext2 - require disklabel_dos :device - fs_parted_list - (( $+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" - 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]] - fi - if (( $+fs_parted_start[$vars[number]] )); then - return 0 - else - do_command=( parted --script mkpart primary $vars[fs] $vars[start] $vars[end] ) - return 1 - fi -} - - # create swap partition confz_swap_check() { checkvars device @@ -131,7 +106,6 @@ local -A level_map checkvars md_device raid_devices level - defvar metadata default devices=( ${(z)vars[raid_devices]} ) @@ -200,7 +174,7 @@ if (($present)); then # empty labels - do_command=( mdadm --create -l $level --metadata=$vars[metadata] -n $#devices $vars[md_device] $devices ) + do_command=( mdadm --create -l $level -n $#devices $vars[md_device] $devices ) else # already created do_command=( mdadm --assemble $vars[md_device] $devices )