=== modified file 'zsh-functions/confz_fs_init' --- zsh-functions/confz_fs_init 2015-04-20 23:00:43 +0000 +++ zsh-functions/confz_fs_init 2015-04-20 13:59:05 +0000 @@ -69,13 +69,13 @@ # check for primary partition confz_primary_partition_check() { - local prev option checkvars device number defvar fs ext2 require disklabel_dos :device fs_parted_list $vars[device] (( $+vars[size] || $+vars[end] )) || die "$0: requires either size or end" if [[ $vars[number] != 1 ]]; then + local prev prev=$[ $vars[number] - 1 ] (( $+fs_parted_start[$prev] )) || die "$0: missing preceding partition" : ${vars[start]:=${fs_parted_start[$prev]}} @@ -97,25 +97,6 @@ (($+vars[align])) && do_command+=( align-check $vars[align] $vars[number] ) - (($+vars[options])) && for option in ${(z)vars[options]}; do - do_command+=( set $vars[number] option ) - done - return 1 - fi -} - - -# check for bootable flag on primary partition -confz_bootable_partition_check() { - checkvars device number - require disklabel_dos :device - fs_parted_list $vars[device] - (( $+fs_parted_other[$vars[number]] )) || \ - die "$0: device ${(q)vars[device]} partition ${(q)vars[number]} not found" - if [[ $fs_parted_other[$vars[number]] = *boot* ]]; then - return 0 - else - do_command=( parted --script $vars[device] -- set $vars[number] boot ) return 1 fi }