Merge ubiquity:lp.1856422-bionic into ubiquity:bionic

Proposed by Steve Langasek
Status: Needs review
Proposed branch: ubiquity:lp.1856422-bionic
Merge into: ubiquity:bionic
Diff against target: 28 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
scripts/simple-plugins (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+376816@code.launchpad.net
To post a comment you must log in.

Unmerged commits

c3293c0... by Steve Langasek

Always invoke mokutil with --timeout -1 so that users don't miss the key enrollment on reboot and end up with broken dkms modules. LP: #1856422.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index c22d79b..222e17f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+ubiquity (18.04.14.14) UNRELEASED; urgency=medium
7+
8+ * Always invoke mokutil with --timeout -1 so that users don't miss the key
9+ enrollment on reboot and end up with broken dkms modules. LP: #1856422.
10+
11+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 14 Dec 2019 17:13:53 -0800
12+
13 ubiquity (18.04.14.13) bionic; urgency=medium
14
15 * d/control: Recommend grub-efi-amd64 or grub-efi-ia32, not the transitional
16diff --git a/scripts/simple-plugins b/scripts/simple-plugins
17index 77d6817..bcd0077 100755
18--- a/scripts/simple-plugins
19+++ b/scripts/simple-plugins
20@@ -16,7 +16,7 @@ if [ "$1" = "prepare" ]; then
21 if [ -n "$RET" ]; then
22 mkdir -p /var/lib/shim-signed/mok
23 /usr/lib/ubiquity/shim-signed/update-secureboot-policy --new-key
24- printf '%s\n%s\n' "$RET" "$RET" | mokutil --import /var/lib/shim-signed/mok/MOK.der >/dev/null || true
25+ printf '%s\n%s\n' "$RET" "$RET" | mokutil --timeout -1 --import /var/lib/shim-signed/mok/MOK.der >/dev/null || true
26 fi
27 # Always clear secureboot key.
28 db_set ubiquity/secureboot_key ''

Subscribers

People subscribed via source and target branches