From: Michael Prokop Date: Fri, 17 Nov 2023 16:07:38 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/pr/239' X-Git-Tag: v0.105~7 X-Git-Url: http://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=d275bdfe5ba2b9abcf67687311110ae2dc5ac90f;hp=c5357622163341d7364f38d6d2e675e933dcb157 Merge remote-tracking branch 'origin/pr/239' --- diff --git a/grml-debootstrap b/grml-debootstrap index 8d9e1db..0489c52 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -1029,14 +1029,16 @@ efi_support() { checkconfiguration() { -if efi_support ; then - if [ -z "$_opt_efi" ] ; then - ewarn "EFI support detected but no --efi option given, please consider enabling it." - fi -else - if [ -n "$_opt_efi" ] ; then - eerror "EFI option used but no EFI support detected." - bailout 1 +if [ -z "$VIRTUAL" ] ; then + if efi_support ; then + if [ -z "$_opt_efi" ] ; then + ewarn "EFI support detected but no --efi option given, please consider enabling it." + fi + else + if [ -n "$_opt_efi" ] ; then + eerror "EFI option used but no EFI support detected." + bailout 1 + fi fi fi