From e8daf3d9519545984cdf275b132cc7b8184aec71 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 11 Apr 2022 20:42:09 +0200 Subject: [PATCH] fix btrfs raid selection --- usr/lib/archboot/installer/btrfs.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr/lib/archboot/installer/btrfs.sh b/usr/lib/archboot/installer/btrfs.sh index 9e11d6ab7..ee6bd8b88 100644 --- a/usr/lib/archboot/installer/btrfs.sh +++ b/usr/lib/archboot/installer/btrfs.sh @@ -128,14 +128,10 @@ btrfs_raid_level() { # select btrfs raid devices select_btrfs_raid_devices () { - # show all devices with sizes - # DIALOG --msgbox "DISKS:\n$(_getavaildisks)\n\nPARTITIONS:\n$(_getavailpartitions)" 0 0 # select the second device to use, no missing option available! : >/tmp/.btrfs-devices - BTRFS_PART="${BTRFS_DEVICE}" - BTRFS_PARTS="${PARTS}" echo "${BTRFS_PART}" >>/tmp/.btrfs-devices - BTRFS_PARTS="$(echo "${BTRFS_PARTS}" | sed -e "s#${BTRFS_PART}\ _##g")" + BTRFS_PARTS=$(echo ${PARTS} | sed -e "s#${BTRFS_PART}\ _##g") RAIDNUMBER=2 #shellcheck disable=SC2086 DIALOG --menu "Select device ${RAIDNUMBER}" 21 50 13 ${BTRFS_PARTS} 2>"${ANSWER}" || return 1 @@ -150,7 +146,7 @@ select_btrfs_raid_devices () { [[ "${RAIDNUMBER}" -ge 4 && "${BTRFS_LEVEL}" = "raid5" ]] && BTRFS_DONE="DONE _" [[ "${RAIDNUMBER}" -ge 5 && "${BTRFS_LEVEL}" = "raid10" || "${BTRFS_LEVEL}" = "raid6" ]] && BTRFS_DONE="DONE _" # clean loop from used partition and options - BTRFS_PARTS="$(echo "${BTRFS_PARTS}" | sed -e "s#${BTRFS_PART}\ _##g")" + BTRFS_PARTS=$(echo ${BTRFS_PARTS} | sed -e "s#${BTRFS_PART}\ _##g") # add more devices #shellcheck disable=SC2086 DIALOG --menu "Select device ${RAIDNUMBER}" 21 50 13 ${BTRFS_PARTS} ${BTRFS_DONE} 2>"${ANSWER}" || return 1