Lubuntu/calamares-settings-ubuntu
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/+git/calamares-settings-ubuntu synced 2025-06-26 09:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generalize installation of GRUB for EFI.

Browse Source 
Summary: See T97.

Test Plan: Already tested. Ship it!

Reviewers: tsimonq2

Reviewed By: tsimonq2

Differential Revision: https://phab.lubuntu.me/D33
This commit is contained in:
Walter Lapchynski 2018-10-09 21:52:46 -07:00
parent 8914c0f210
commit 9c6c1de9fe
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,4 +1,4 @@
calamares-settings-ubuntu (24) UNRELEASED; urgency=medium calamares-settings-ubuntu (24) cosmic; urgency=medium
[ Wendy Hill ] [ Wendy Hill ]
* Rework the Lubuntu slideshow. * Rework the Lubuntu slideshow.
@ -6,7 +6,10 @@ calamares-settings-ubuntu (24) UNRELEASED; urgency=medium
[ Simon Quigley ] [ Simon Quigley ]
* Add -E to the desktop icon so that our nice theming carries over. * Add -E to the desktop icon so that our nice theming carries over.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 09 Oct 2018 13:32:45 -0500 [ Walter Lapchynski ]
* Generalize installation of GRUB for EFI.
-- Walter Lapchynski <wxl@ubuntu.com> Tue, 09 Oct 2018 21:51:55 -0700
calamares-settings-ubuntu (23) cosmic; urgency=medium calamares-settings-ubuntu (23) cosmic; urgency=medium

5
lubuntu/modules/before_bootloader_context.conf
View File

@ -2,12 +2,13 @@
# Also pull in shim so secureboot has a chance at working. # Also pull in shim so secureboot has a chance at working.
--- ---
firmwareType: firmwareType:
efi: bios: /bin/false
"*":
- command: apt-cdrom add -m -d=/media/cdrom/ - command: apt-cdrom add -m -d=/media/cdrom/
timeout: 10 timeout: 10
- command: apt-get update - command: apt-get update
timeout: 120 timeout: 120
- command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-amd64-signed - 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)
timeout: 300 timeout: 300
- command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed
timeout: 300 timeout: 300