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

revert commit

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-04 07:40:10 +02:00
parent 98cc4ec16f
commit 9456570423
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,9 +47,7 @@ _find_btrfs_subvolume() {
# existing btrfs subvolumes # existing btrfs subvolumes
_mount_btrfs _mount_btrfs
for i in $(btrfs subvolume list "${_BTRFSMP}" | cut -d ' ' -f 9 | grep -v 'var/lib/machines' | grep -v 'var/lib/portables'); do for i in $(btrfs subvolume list "${_BTRFSMP}" | cut -d ' ' -f 9 | grep -v 'var/lib/machines' | grep -v 'var/lib/portables'); do
# add echo without "" to kill hidden escapes from btrfs call echo "${i}"
#shellcheck disable=SC2116,2086
echo ${i}
[[ "${1}" ]] && echo "${1}" [[ "${1}" ]] && echo "${1}"
done done
_umount_btrfs _umount_btrfs
@ -233,6 +231,7 @@ _choose_btrfs_subvolume () {
_subvolumes_in_use _subvolumes_in_use
# add echo to kill hidden escapes from btrfs call # add echo to kill hidden escapes from btrfs call
#shellcheck disable=SC2116,2086 #shellcheck disable=SC2116,2086
_SUBVOLUMES="$(echo ${_SUBVOLUMES})"
for i in ${_SUBVOLUME_IN_USE}; do for i in ${_SUBVOLUME_IN_USE}; do
_SUBVOLUMES="${_SUBVOLUMES//${i} _/}" _SUBVOLUMES="${_SUBVOLUMES//${i} _/}"
done done
@ -243,7 +242,7 @@ _choose_btrfs_subvolume () {
_btrfs_compress || return 1 _btrfs_compress || return 1
else else
if [[ -n "${_SUBVOLUMES_DETECTED}" ]]; then if [[ -n "${_SUBVOLUMES_DETECTED}" ]]; then
_dialog --title " ERROR " --no-mouse --infobox "All subvolumes of the device are already in use.\nSwitching to create a new one now." 4 50 _dialog --title " ERROR " --no-mouse --infobox "All subvolumes of the device are already in use.\nSwitching to create a new one now." 4 50f
sleep 5 sleep 5
_prepare_btrfs_subvolume || return 1 _prepare_btrfs_subvolume || return 1
fi fi