root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix multi bcachefs devices

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-29 20:46:37 +02:00
parent efb6932cce
commit d370775f1f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr/lib/archboot/installer/bcachefs.sh
View file

@ -24,7 +24,7 @@ _bcfs_raid_options() {
fi
_DUR_COUNT=$((_DUR_COUNT + _BCFS_DURABILITY))
fi
if [[ "$(cat /sys/block/"$(basename "${_BCFS_RAID_DEV}")"/queue/rotational)" == 0 ]]; then
if [[ "$(cat /sys/block/"$(basename "${_BCFS_RAID_DEV}")"/queue/rotational 2>"${_NO_LOG}")" == 0 ]]; then
_BCFS_SSD_COUNT=$((_BCFS_SSD_COUNT + 1))
_BCFS_LABEL="--label ssd.ssd${_BCFS_SSD_COUNT}"
_BCFS_SSD_OPTIONS=1
@ -132,6 +132,7 @@ _bcfs_raid_level() {
0 0; then
while read -r i; do
_BCFS_DEVS="${_BCFS_DEVS} ${i}"
# cleanup _DEVS array from used devices
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "$(echo "${i}" | rg -o '/dev/.*')" 2>"${_NO_LOG}")/}"
done </tmp/.bcfs-raid-device
break

1
usr/lib/archboot/installer/btrfs.sh
View file

@ -171,6 +171,7 @@ _select_btrfsraid_devices () {
#shellcheck disable=SC2028
_dialog --title " Summary " --yesno "LEVEL:\n${_BTRFS_LEVEL}\n\nDEVICES:\n$(while read -r i; do echo "${i}\n"; done </tmp/.btrfs-devices)" 0 0 && _BTRFS_RAID_FINISH="DONE"
while read -r i; do
# cleanup _DEVS array from used devices
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${i}" 2>"${_NO_LOG}")/}"
done </tmp/.btrfs-devices
}