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

fix mountpoints

Browse source
This commit is contained in:
Tobias Powalowski 2023-06-23 20:56:56 +02:00
parent 87ba4207b9
commit 9c3e861cf2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/installer/mountpoints.sh
View file

@ -420,7 +420,7 @@ _mkfs() {
if [[ -n "${_CREATE_MOUNTPOINTS}" && "${5}" = "/efi" && ! -d "${3}${5}/EFI" ]]; then
mkdir "${3}${5}/EFI"
fi
if [[ -n "${_CREATE_MOUNTPOINTS}" && "${5}" = "/boot" && -n "${_UEFI_BOOT}" && ! $(mountpoint -q "${3}/efi") && ! -d "${3}${5}/EFI" ]]; then
if [[ -n "${_CREATE_MOUNTPOINTS}" && "${5}" = "/boot" && -n "${_UEFI_BOOT}" && ! $(mountpoint "${3}/efi" 2>${_NO_LOG}) && ! -d "${3}${5}/EFI" ]]; then
mkdir "${3}${5}/EFI"
fi
# check if /boot exists on ROOT DEVICE
@ -436,7 +436,7 @@ _mkfs() {
return 1
fi
# check on /EFI on /boot
if [[ -z "${_CREATE_MOUNTPOINTS}" && "${5}" = "/boot" && -n "${_UEFI_BOOT}" && ! $(mountpoint -q "${3}/efi") && ! -d "${3}${5}/EFI" ]]; then
if [[ -z "${_CREATE_MOUNTPOINTS}" && "${5}" = "/boot" && -n "${_UEFI_BOOT}" && ! $(mountpoint "${3}/efi 2>${_NO_LOG}") && ! -d "${3}${5}/EFI" ]]; then
_dialog --msgbox "Error: EFI SYSTEM PARTITION (ESP) ${3}${5} does not contain /EFI directory." 0 0
_umountall
return 1