xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show initial mount confirmation when were using btrfs subvolumes

Browse Source
This commit is contained in:
natemaia 2020-05-17 19:18:15 -07:00
parent 1c74c329ce
commit 57dcdcd749
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
installer
View File

@ -1054,7 +1054,7 @@ part_mount()
# skipped formatting on existing btrfs partition? # 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 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 btrfs_mount "$part" "$mntp" "$SUBVOL" || return 1
else else
if [[ $BTRFS -ne 2 && $fs && ${FS_OPTS[$fs]} && $part != "$BOOT" && $part != "$AUTO_ROOT" ]] && select_mntopts "$part" "$fs"; then 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" mount "$part" "$mntp" > /dev/null 2> "$ERR"
errshow 0 "mount $part $mntp" || return 1 errshow 0 "mount $part $mntp" || return 1
fi fi
msg "Mount Complete" "\nMounted $part at $mntp\n" 1 (( BTRFS != 2 )) && msg "Mount Complete" "\nMounted $part at $mntp\n" 1
fi fi
part_countdec "$part" part_countdec "$part"
part_cryptlv "$part" part_cryptlv "$part"
return 0 return 0