mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
simplify bcachefs raid menu
This commit is contained in:
parent
19a154b62d
commit
e7c51f9a0b
1 changed files with 24 additions and 17 deletions
|
@ -56,22 +56,27 @@ _bcfs_select_raid_devices () {
|
||||||
while [[ "${_BCFS_RAID_DEV}" != "> DONE" ]]; do
|
while [[ "${_BCFS_RAID_DEV}" != "> DONE" ]]; do
|
||||||
_BCFS_DONE=""
|
_BCFS_DONE=""
|
||||||
_RAIDNUMBER=$((_RAIDNUMBER + 1))
|
_RAIDNUMBER=$((_RAIDNUMBER + 1))
|
||||||
|
# clean loop from used partition and options
|
||||||
|
_BCFS_RAID_DEVS=${_BCFS_RAID_DEVS//${_BCFS_RAID_DEV} _/}
|
||||||
### RAID5/6 is not ready atm 23052024
|
### RAID5/6 is not ready atm 23052024
|
||||||
# RAID5/6 need ec option!
|
# RAID5/6 need ec option!
|
||||||
# RAID5 needs 3 devices
|
# RAID5 needs 3 devices
|
||||||
# RAID6 and RAID10 need 4 devices!
|
# RAID6 and RAID10 need 4 devices!
|
||||||
[[ "$((_RAIDNUMBER + _DUR_COUNT))" -ge "$((_BCFS_REP_COUNT + 1))" &&\
|
if [[ "$((_RAIDNUMBER + _DUR_COUNT))" -ge "$((_BCFS_REP_COUNT + 1))" &&\
|
||||||
! "${_BCFS_LEVEL}" == "raid10" && ! "${_BCFS_LEVEL}" == "raid6" &&\
|
! "${_BCFS_LEVEL}" == "raid10" && ! "${_BCFS_LEVEL}" == "raid6" &&\
|
||||||
! "${_BCFS_LEVEL}" == "raid5" ]] && _BCFS_DONE="DONE _"
|
! "${_BCFS_LEVEL}" == "raid5" ]] ||\
|
||||||
[[ "$((_RAIDNUMBER + _DUR_COUNT))" -ge "$((_BCFS_REP_COUNT + 2))" &&\
|
[[ "$((_RAIDNUMBER + _DUR_COUNT))" -ge "$((_BCFS_REP_COUNT + 2))" &&\
|
||||||
"${_BCFS_LEVEL}" == "raid5" ]] && _BCFS_DONE="DONE _"
|
"${_BCFS_LEVEL}" == "raid5" ]] ||\
|
||||||
[[ "$((_RAIDNUMBER + _DUR_COUNT))" -ge "$((_BCFS_REP_COUNT + 3))" &&\
|
[[ "$((_RAIDNUMBER + _DUR_COUNT))" -ge "$((_BCFS_REP_COUNT + 3))" &&\
|
||||||
"${_BCFS_LEVEL}" == "raid10" || "${_BCFS_LEVEL}" == "raid6" ]] && _BCFS_DONE="DONE _"
|
"${_BCFS_LEVEL}" == "raid10" || "${_BCFS_LEVEL}" == "raid6" ]]; then
|
||||||
# clean loop from used partition and options
|
|
||||||
_BCFS_RAID_DEVS=${_BCFS_RAID_DEVS//${_BCFS_RAID_DEV} _/}
|
|
||||||
# add more devices
|
# add more devices
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
_dialog --title " Device ${_RAIDNUMBER} " --no-cancel --menu "" 12 50 6 ${_BCFS_RAID_DEVS} ${_BCFS_DONE} 2>"${_ANSWER}" || return 1
|
_dialog --title " Device ${_RAIDNUMBER} " --no-cancel --menu "" 12 50 6 \
|
||||||
|
${_BCFS_RAID_DEVS} "> DONE" "Proceed To Summary" 2>"${_ANSWER}" || return 1
|
||||||
|
else
|
||||||
|
_dialog --title " Device ${_RAIDNUMBER} " --no-cancel --menu "" 12 50 6 \
|
||||||
|
${_BCFS_RAID_DEVS} 2>"${_ANSWER}" || return 1
|
||||||
|
fi
|
||||||
_BCFS_RAID_DEV=$(cat "${_ANSWER}")
|
_BCFS_RAID_DEV=$(cat "${_ANSWER}")
|
||||||
[[ "${_BCFS_RAID_DEV}" == "> DONE" ]] && break
|
[[ "${_BCFS_RAID_DEV}" == "> DONE" ]] && break
|
||||||
_bcfs_raid_options || return 1
|
_bcfs_raid_options || return 1
|
||||||
|
@ -117,12 +122,14 @@ _bcfs_raid_level() {
|
||||||
_bcfs_select_raid_devices || return 1
|
_bcfs_select_raid_devices || return 1
|
||||||
# final step ask if everything is ok?
|
# final step ask if everything is ok?
|
||||||
#shellcheck disable=SC2028,SC2027,SC2086
|
#shellcheck disable=SC2028,SC2027,SC2086
|
||||||
_dialog --title " Summary " --yesno \
|
if _dialog --title " Summary " --yesno \
|
||||||
"LEVEL:\n${_BCFS_LEVEL}\nDEVICES:\n$(while read -r i; do echo ""${i}"\n"; done </tmp/.bcfs-raid-device)" \
|
"LEVEL:\n${_BCFS_LEVEL}\nDEVICES:\n$(while read -r i; do echo ""${i}"\n"; done </tmp/.bcfs-raid-device)" \
|
||||||
0 0 && break
|
0 0; then
|
||||||
while read -r i; do
|
while read -r i; do
|
||||||
_BCFS_DEVS="${_BCFS_DEVS} ${i}"
|
_BCFS_DEVS="${_BCFS_DEVS} ${i}"
|
||||||
done </tmp/.bcfs-raid-device
|
done </tmp/.bcfs-raid-device
|
||||||
|
break
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue