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

other logic

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-10 22:06:59 +01:00
parent e2a35d5c4d
commit a326b821a4
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,6 @@ _check_btrfs_filesystem_creation() {
_SKIP_FILESYSTEM=""
_SKIP_ASK_SUBVOLUME=""
#shellcheck disable=SC2013
for i in $(grep "${_PART}[:#]" /tmp/.parts); do
if echo "${i}" | grep -q ":btrfs:"; then
_FSTYPE="btrfs"
@ -247,13 +246,11 @@ _choose_btrfs_subvolume () {
_btrfs_subvolume() {
_FILESYSTEM_FINISH=""
if [[ "${_FSTYPE}" == "btrfs" && -n "${_SKIP_FILESYSTEM}" ]]; then
if [[ -n "${_ASK_MOUNTPOINTS}" ]]; then
_prepare_btrfs_subvolume || return 1
else
_choose_btrfs_subvolume || return 1
fi
_btrfs_compress
_choose_btrfs_subvolume || return 1
else
_prepare_btrfs_subvolume || return 1
fi
_btrfs_compress
_FILESYSTEM_FINISH=1
}