Skip to content

Commit b8a6a2c

Browse files
committed
efi_support: drop BIOS-mode info
Absence of an EFI runtime does not prevent loading efivarfs since commit 301de9a2055357375a4e1053d9df0f8f3467ff00 which landed in Linux v6.3. Thus our check code cannot work anymore, and the message is at best misleading.
1 parent 6a1d471 commit b8a6a2c

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

grml-debootstrap

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -976,21 +976,17 @@ format_efi_partition() {
976976

977977
# check for EFI support or try to enable it {{{
978978
efi_support() {
979-
local efivars_loaded=false
980-
if modprobe efivarfs &>/dev/null ; then
981-
efivars_loaded=true
982-
fi
979+
# Absence of an EFI runtime does not prevent loading efivarfs since commit
980+
# 301de9a2055357375a4e1053d9df0f8f3467ff00 which landed in Linux v6.3.
981+
# Unconditionally load it, in case nothing else attempted it.
982+
modprobe efivarfs &>/dev/null || true
983983

984984
if [ -d /sys/firmware/efi ] ; then
985985
einfo "EFI support detected."
986986
return 0
987987
fi
988988

989-
if ! [ -d /sys/firmware/efi ] && [ "${efivars_loaded:-}" = "true" ] ; then
990-
einfo "EFI support detected, but system seems to be running in BIOS mode."
991-
fi
992-
993-
# The user may have a legitimate reason to do an EFI installation on a BIOS
989+
# The user may have a legitimate reason to do an EFI installation on a non-EFI
994990
# system (for instance if doing a hybrid-bootable installation), so don't
995991
# return 1 here.
996992
}

0 commit comments

Comments
 (0)