ubiquity

Merge ubiquity:lp.1856422 into ubiquity:master

  1. Git
  2. lp:ubiquity
  3. lp.1856422
  4. Merge into master
Proposed by Steve Langasek
Status: Merged
Merged at revision: f74fd36e9744feb8b4af66160fcdb214387e234e
Proposed branch: ubiquity:lp.1856422
Merge into: ubiquity:master
Diff against target: 27 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
scripts/simple-plugins (+1/-0)
Reviewer Review Type Date Requested Status
Jean-Baptiste Lallement Approve
Review via email: mp+376815@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jean-Baptiste Lallement (jibel) wrote :

Works as expected. Approved.

review: Approve

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 a95efcc..f9c9b25 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+ubiquity (20.04.13) 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> Wed, 15 Apr 2020 23:47:45 -0700
12+
13 ubiquity (20.04.12) focal; urgency=medium
14
15 [ Iain Lane ]
16diff --git a/scripts/simple-plugins b/scripts/simple-plugins
17index ce2fb49..2558385 100755
18--- a/scripts/simple-plugins
19+++ b/scripts/simple-plugins
20@@ -26,6 +26,7 @@ if [ "$1" = "prepare" ]; then
21 mkdir -p /var/lib/shim-signed/mok
22 /usr/lib/ubiquity/shim-signed/update-secureboot-policy --new-key
23 printf '%s\n%s\n' "$RET" "$RET" | mokutil --import /var/lib/shim-signed/mok/MOK.der >/dev/null || true
24+ mokutil --timeout -1 >/dev/null || true
25 fi
26 # Always clear secureboot key.
27 db_set ubiquity/secureboot_key ''

Subscribers

People subscribed via source and target branches