root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add new error message

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-10 20:58:18 +01:00
parent 307bd75b45
commit 488d998f2c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr/lib/archboot/installer/btrfs.sh
View file

@ -206,6 +206,10 @@ _check_btrfs_subvolume(){
done
_umount_btrfs
else
if [[ -z "$(cat ${_ANSWER})" ]]; then
_dialog --msgbox "ERROR: You have defined an empty name! Please enter another name." 8 65
_BTRFS_SUBVOLUME="NONE"
fi
_subvolumes_in_use
if echo "${_SUBVOLUME_IN_USE}" | grep -Eq "${_BTRFS_SUBVOLUME}"; then
_dialog --msgbox "ERROR: You have defined 2 identical SUBVOLUME names or an empty name! Please enter another name." 8 65
@ -257,9 +261,9 @@ _btrfs_subvolume() {
# create subvolume if requested
# choose btrfs subvolume if present
_prepare_btrfs_subvolume || return 1
if [[ "${_BTRFS_SUBVOLUME}" == "NONE" ]]; then
_choose_btrfs_subvolume || return 1
fi
#if [[ "${_BTRFS_SUBVOLUME}" == "NONE" ]]; then
# _choose_btrfs_subvolume || return 1
#fi
else
# use device if no subvolume is present
_choose_btrfs_subvolume || return 1