From 57dcdcd7490fc697ccbea962081b556815f0792a Mon Sep 17 00:00:00 2001 From: natemaia Date: Sun, 17 May 2020 19:18:15 -0700 Subject: [PATCH] Don't show initial mount confirmation when were using btrfs subvolumes --- installer | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/installer b/installer index 0f15c5c..6cbd7ef 100755 --- a/installer +++ b/installer @@ -1054,7 +1054,7 @@ part_mount() # skipped formatting on existing btrfs partition? if [[ $fs == 'btrfs' && $BTRFS -eq 0 ]] && yesno "Btrfs Subvolume Mount" "\nDo you have a subvolume on $part that should be mounted at $mntp?\n"; then - btrfs_name "\nEnter the name of initial subvolume on $part to be mounted at $mntp.\n\ne.g. mount -o subvol=YOUR_SUBVOL $part $mntp\n" || return 1 + btrfs_name "\nEnter the name of the subvolume on $part to be mounted at $mntp.\n\ne.g. mount -o subvol=YOUR_SUBVOL $part $mntp\n" || return 1 btrfs_mount "$part" "$mntp" "$SUBVOL" || return 1 else if [[ $BTRFS -ne 2 && $fs && ${FS_OPTS[$fs]} && $part != "$BOOT" && $part != "$AUTO_ROOT" ]] && select_mntopts "$part" "$fs"; then @@ -1065,9 +1065,8 @@ part_mount() mount "$part" "$mntp" > /dev/null 2> "$ERR" errshow 0 "mount $part $mntp" || return 1 fi - msg "Mount Complete" "\nMounted $part at $mntp\n" 1 + (( BTRFS != 2 )) && msg "Mount Complete" "\nMounted $part at $mntp\n" 1 fi - part_countdec "$part" part_cryptlv "$part" return 0