projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve EFI detection by checking for /sys/firmware/efi
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
52adf78
..
ae601f8
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-987,14
+987,18
@@
format_efi_partition() {
# check for EFI support or try to enable it {{{
efi_support() {
# check for EFI support or try to enable it {{{
efi_support() {
- if lsmod | grep -q efivars ; then
+ local efivars_loaded=false
+ if modprobe efivars &>/dev/null ; then
+ efivars_loaded=true
+ fi
+
+ if [ -d /sys/firmware/efi ] ; then
einfo "EFI support detected." ; eend 0
return 0
fi
einfo "EFI support detected." ; eend 0
return 0
fi
- if modprobe efivars &>/dev/null ; then
- einfo "EFI support enabled now." ; eend 0
- return 0
+ if ! [ -d /sys/firmware/efi ] && [ "${efivars_loaded:-}" = "true" ] ; then
+ einfo "EFI support detected, but system seems to be running in BIOS mode."
fi
return 1
fi
return 1