From d32d94c7966d93045497b3882805634538a8dd8f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 24 Dec 2020 15:30:01 -0700
Subject: [PATCH] Fix EFI variable, update CI to use 20.04

---
 .gitlab-ci.yml | 3 ++-
 mk/config.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2970ca3..04691e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "ubuntu:18.04"
+image: "ubuntu:20.04"
 
 variables:
   GIT_STRATEGY: "pull"
@@ -7,6 +7,7 @@ variables:
 
 before_script:
  - |
+    export DEBIAN_FRONTEND=noninteractive
     apt-get update -qq &&
     apt-get install -qq \
         bison \
diff --git a/mk/config.mk b/mk/config.mk
index 45a7cdc..642803c 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -53,7 +53,7 @@ INSTALLER=\
  	installer/target/release/redox_installer $(INSTALLER_FLAGS)
 
 ## Bootloader variables
-EFI_TARGET=$(ARCH)-efi-pe
+EFI_TARGET=$(ARCH)-unknown-uefi
 
 ## Cross compiler variables
 AR=$(TARGET)-gcc-ar