diff options
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index a77a873..2ee3a2c 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -468,22 +468,21 @@ interactive_filesystem () fs_params="$fs_params$pv" fi - list= + list=() for pv in $fs_params do - list="$list $pv ^ ON" + list+=("$pv" ^ ON) done for pv in `grep '+ lvm-pv' $TMP_BLOCKDEVICES | awk '{print $1}' | sed 's/\+$//'` # find PV's to be added: their blockdevice ends on + and has lvm-pv as type #TODO: i'm not sure we check which pv's are taken already do - grep -q "$pv ^ ON" <<< "$list" || list="$list $pv - OFF" + grep -q "$pv ^ ON" <<< "${list[@]}" || list+=("$pv" - OFF) done - list2=($list) - if [ ${#list2[*]} -lt 6 ] # less then 6 words in the list. eg only one option + if [ ${#list[*]} -lt 6 ] # less then 6 words in the list. eg only one option then - notify "Automatically picked PV ${list2[0]} to use for this VG. It's the only available lvm PV" - fs_params=${list2[0]} + notify "Automatically picked PV ${list[0]} to use for this VG. It's the only available lvm PV" + fs_params=${list[0]} else - ask_checklist "Which lvm PV's must this volume group span?" $list || return 1 + ask_checklist "Which lvm PV's must this volume group span?" 0 "${list[@]}" || return 1 fs_params="${ANSWER_CHECKLIST[@]}" fi fi @@ -742,7 +741,7 @@ If any previous configuration you've done until now (like fancy filesystems) req grouplist+=(${i} - OFF) done - ask_checklist "Select Package groups\nDo not deselect base unless you know what you're doing!" "${grouplist[@]}" || return 1 + ask_checklist "Select Package groups\nDo not deselect base unless you know what you're doing!" 0 "${grouplist[@]}" || return 1 grouplist=("${ANSWER_CHECKLIST[@]}") # get sorted array of available packages, with their groups. TODO: we should use $repos here |