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 subdir for btrfs on subvolumes

Browse source 
#2
This commit is contained in:
Tobias Powalowski 2021-09-15 12:29:29 +02:00
parent 145127cf66
commit b29ef17fbf
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/share/archboot/installer/setup
View file

@ -3902,13 +3902,13 @@ do_grub_config() {
if [[ "${ROOT_PART_FS_UUID}" == "${BOOT_PART_FS_UUID}" ]]; then
subdir="/boot"
# on btrfs we need to check on subvol
if [[ $(mount "${DESTDIR}/ " | grep btrfs | grep subvol) ]]; then
if [[ $(mount | grep "${DESTDIR} " | grep btrfs | grep subvol) ]]; then
subdir="$(btrfs subvolume show "${DESTDIR}/" | grep Name | cut -d ":" -f2)"
fi
else
subdir=""
# on btrfs we need to check on subvol
if [[ $(mount "${DESTDIR}/boot" | grep btrfs | grep subvol) ]]; then
if [[ $(mount | "${DESTDIR}/boot " | grep btrfs | grep subvol) ]]; then
subdir="$(btrfs subvolume show "${DESTDIR}/boot" | grep Name | cut -d ":" -f2)"
fi
fi