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 brtfs

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 12:43:36 +01:00
parent c8214ab433
commit 05ea26ddc0
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,10 +231,15 @@ _mountpoints() {
_btrfs_parts
_check_mkfs_values
echo "${_DEV}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts
#shellcheck disable=SC2001,SC2086
[[ ! "${_FSTYPE}" == "btrfs" || -n ${_DO_ROOT} ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
fi
# always remove root device
if [[ -n "${_DO_ROOT}" ]]; then
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
else
# don't remove btrfs format devices on none root MP
[[ ! "${_FSTYPE}" == "btrfs" ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
fi
_DO_ROOT=""
fi
done
#shellcheck disable=SC2028
_dialog --yesno "Would you like to create and mount the filesytems like this?\n\nSyntax\n------\nDEVICE:FSTYPE:MOUNTPOINT:FORMAT:LABEL:FSOPTIONS:BTRFS_DETAILS\n\n$(while read -r i;do echo "${i}\n" | sed -e 's, ,#,g';done </tmp/.parts)" 0 0 && _DEVFINISH="DONE"