mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer.sh: fail validation for EFI systems without proper ESP

Browse Source 
Right now the installer will print an error dialog but mark the
filesystems done anyway and march on, which will later result
in a failed GRUB installation.
This commit is contained in:
q66 2019-07-18 21:06:17 +02:00
parent a3f49d0c11
commit f4458db134
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
installer.sh.in
View File

@ -952,6 +952,7 @@ menu_network() {
validate_filesystems() { validate_filesystems() {
local mnts dev size fstype mntpt mkfs rootfound fmt local mnts dev size fstype mntpt mkfs rootfound fmt
local usrfound efi_system_partition local usrfound efi_system_partition
local bootdev=$(get_option BOOTLOADER)
unset TARGETFS unset TARGETFS
mnts=$(grep -E '^MOUNTPOINT.*' $CONF_FILE) mnts=$(grep -E '^MOUNTPOINT.*' $CONF_FILE)
@ -985,10 +986,11 @@ the mount point for the root filesystem (/) has not yet been configured." ${MSGB
DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} \ DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} \
/usr mount point has been configured but is not supported, please remove it to continue." ${MSGBOXSIZE} /usr mount point has been configured but is not supported, please remove it to continue." ${MSGBOXSIZE}
return 1 return 1
elif [ -n "$EFI_SYSTEM" -a -z "$efi_system_partition" ]; then elif [ -n "$EFI_SYSTEM" -a "$bootdev" != "none" -a -z "$efi_system_partition" ]; then
DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} \ DIALOG --msgbox "${BOLD}${RED}ERROR:${RESET} \
The EFI System Partition has not yet been configured, please create it\n The EFI System Partition has not yet been configured, please create it\n
as FAT32, mountpoint /boot/efi and at least with 100MB of size." ${MSGBOXSIZE} as FAT32, mountpoint /boot/efi and at least with 100MB of size." ${MSGBOXSIZE}
return 1
fi fi
FILESYSTEMS_DONE=1 FILESYSTEMS_DONE=1
} }
@ -1191,17 +1193,10 @@ enable_dhcpd() {
} }
menu_install() { menu_install() {
# Don't continue if filesystems are not ready.
validate_filesystems || return 1
ROOTPASSWORD_DONE="$(get_option ROOTPASSWORD)" ROOTPASSWORD_DONE="$(get_option ROOTPASSWORD)"
BOOTLOADER_DONE="$(get_option BOOTLOADER)" BOOTLOADER_DONE="$(get_option BOOTLOADER)"
if [ -z "$FILESYSTEMS_DONE" ]; then if [ -z "$ROOTPASSWORD_DONE" ]; then
DIALOG --msgbox "${BOLD}Required filesystems were not configured, \
please do so before starting the installation.${RESET}" ${MSGBOXSIZE}
return 1
elif [ -z "$ROOTPASSWORD_DONE" ]; then
DIALOG --msgbox "${BOLD}The root password has not been configured, \ DIALOG --msgbox "${BOLD}The root password has not been configured, \
please do so before starting the installation.${RESET}" ${MSGBOXSIZE} please do so before starting the installation.${RESET}" ${MSGBOXSIZE}
return 1 return 1
@ -1211,6 +1206,16 @@ configured, please do so before starting the installation.${RESET}" ${MSGBOXSIZE
return 1 return 1
fi fi
# Validate filesystems after making sure bootloader is done,
# so that specific checks can be made based on the selection
validate_filesystems || return 1
if [ -z "$FILESYSTEMS_DONE" ]; then
DIALOG --msgbox "${BOLD}Required filesystems were not configured, \
please do so before starting the installation.${RESET}" ${MSGBOXSIZE}
return 1
fi
DIALOG --yesno "${BOLD}The following operations will be executed:${RESET}\n\n DIALOG --yesno "${BOLD}The following operations will be executed:${RESET}\n\n
${BOLD}${TARGETFS}${RESET}\n ${BOLD}${TARGETFS}${RESET}\n
${BOLD}${RED}WARNING: data on partitions will be COMPLETELY DESTROYED for new \ ${BOLD}${RED}WARNING: data on partitions will be COMPLETELY DESTROYED for new \