From b29ef17fbfc33f37bda3b9bed7efb46ce48bda23 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 15 Sep 2021 12:29:29 +0200 Subject: [PATCH] fix subdir for btrfs on subvolumes #2 --- usr/share/archboot/installer/setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup index 13b5ae61c..0a1432db6 100755 --- a/usr/share/archboot/installer/setup +++ b/usr/share/archboot/installer/setup @@ -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