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

fix subvolume substitution

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-03 21:43:07 +02:00
parent 287130258c
commit 659faaa119
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ _find_btrfs_bootloader_subvolume() {
_subvolumes_in_use() { _subvolumes_in_use() {
_SUBVOLUME_IN_USE="" _SUBVOLUME_IN_USE=""
while read -r i; do while read -r i; do
echo "${i}" | grep -q "\|btrfs\|" && _SUBVOLUME_IN_USE="${_SUBVOLUME_IN_USE} $(echo "${i}" | cut -d '|' -f 9)" echo "${i}" | grep -q "|btrfs|" && _SUBVOLUME_IN_USE="${_SUBVOLUME_IN_USE} $(echo "${i}" | cut -d '|' -f 9)"
done < /tmp/.parts done < /tmp/.parts
} }
@ -231,7 +231,7 @@ _choose_btrfs_subvolume () {
_subvolumes_in_use _subvolumes_in_use
for i in ${_SUBVOLUME_IN_USE}; do for i in ${_SUBVOLUME_IN_USE}; do
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
_SUBVOLUMES="${_SUBVOLUMES//${i} _/}" _SUBVOLUMES="${_SUBVOLUMES//${i}\ _/}"
done done
if [[ -n "${_SUBVOLUMES}" ]]; then if [[ -n "${_SUBVOLUMES}" ]]; then
#shellcheck disable=SC2086 #shellcheck disable=SC2086