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

put no subvolume name to front

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-10 21:03:03 +01:00
parent 2f7ceef54d
commit bac9a4f877
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -196,20 +196,20 @@ _prepare_btrfs_subvolume() {
# check btrfs subvolume
_check_btrfs_subvolume(){
[[ -n "${_DOMKFS}" && "${_FSTYPE}" == "btrfs" ]] && _DETECT_CREATE_FILESYSTEM=1
if [[ -z "$(cat ${_ANSWER})" ]]; then
_dialog --msgbox "ERROR:\nYou have defined an empty name!\nPlease enter another name." 8 50
_BTRFS_SUBVOLUME="NONE"
fi
if [[ -z "${_DETECT_CREATE_FILESYSTEM}" ]]; then
_mount_btrfs
for i in $(btrfs subvolume list "${_BTRFSMP}" | cut -d " " -f 7); do
if echo "${i}" | grep -q "${_BTRFS_SUBVOLUME}"; then
_dialog --msgbox "ERROR: You have defined 2 identical SUBVOLUME names or an empty name! Please enter another name." 8 65
_dialog --msgbox "ERROR:\You have defined 2 identical SUBVOLUME name!\nPlease enter another name." 8 50
_BTRFS_SUBVOLUME="NONE"
fi
done
_umount_btrfs
else
if [[ -z "$(cat ${_ANSWER})" ]]; then
_dialog --msgbox "ERROR:\nYou have defined an empty name!\nPlease enter another name." 8 50
_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 name!\nPlease enter another name." 8 50