From 1364462c865698b9799e82608c675409ebf736dc Mon Sep 17 00:00:00 2001 From: Walter Lapchynski Date: Fri, 12 Oct 2018 18:40:46 -0700 Subject: [PATCH] fix check for EFI architecture --- debian/changelog | 6 ++++++ lubuntu/modules/before_bootloader_context.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d9cf19..ea8baeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (26) cosmic; urgency=medium + + * Lubuntu: fix check for EFI architecture. + + -- Walter Lapchynski Fri, 12 Oct 2018 18:39:27 -0700 + calamares-settings-ubuntu (25) cosmic; urgency=medium * Ignore BIOS entirely when installing GRUB for EFI. diff --git a/lubuntu/modules/before_bootloader_context.conf b/lubuntu/modules/before_bootloader_context.conf index 003c0b1..0de95dd 100644 --- a/lubuntu/modules/before_bootloader_context.conf +++ b/lubuntu/modules/before_bootloader_context.conf @@ -10,7 +10,7 @@ firmwareType: timeout: 10 - command: apt-get update timeout: 120 - - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if [ "$(grep -q 64 /sys/firmware/efi/fw_platform_size)" ]; then echo amd64-signed; else echo ia32; fi) + - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if [ "$(grep 64 /sys/firmware/efi/fw_platform_size)" ]; then echo amd64-signed; else echo ia32; fi) timeout: 300 - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed timeout: 300