Merge ~mclemenceau/shim/+git/shim-signed:bionic into ~ubuntu-core-dev/shim/+git/shim-signed:bionic

[Matthieu Clemenceau]

In order to SRU this bug LP: #1869187 to bionic I merged attached diff to the bionic devel branch
Update Change Log to match SRU proposed version 1.37~18.04.6

diff --git a/debian/changelog b/debian/changelog
index b286811..8942e59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shim-signed (1.37~18.04.6) bionic; urgency=medium
+
+  * Pass --timeout -1 to mokutil in a separate mokutil run (LP: #1869187)
+    thanks to Aleksander Miera for the patch.
+
+ -- Matthieu Clemenceau <[e-mail]>  Fri, 10 Jul 2020 14:27:41 -0500
+
 shim-signed (1.37~18.04.5) bionic; urgency=medium
 
   * Fix versioned dependency on mokutil so that it matches the version in
diff --git a/update-secureboot-policy b/update-secureboot-policy
index 7ec61a7..ce6d7c5 100755
--- a/update-secureboot-policy
+++ b/update-secureboot-policy
@@ -108,7 +108,8 @@ toggle_validation()
     local again="$2"
 
     echo "Enabling shim validation."
-    printf '%s\n%s\n' "$key" "$again" | mokutil --timeout -1 --enable-validation >/dev/null || true
+    printf '%s\n%s\n' "$key" "$again" | mokutil --enable-validation >/dev/null || true
+    mokutil --timeout -1 >/dev/null || true
 }
 
 enroll_mok()
@@ -117,7 +118,8 @@ enroll_mok()
     local again="$2"
 
     echo "Adding '$SB_KEY' to shim:"
-    printf '%s\n%s\n' "$key" "$again" | mokutil --timeout -1 --import "$SB_KEY" >/dev/null || true
+    printf '%s\n%s\n' "$key" "$again" | mokutil --import "$SB_KEY" >/dev/null || true
+    mokutil --timeout -1 >/dev/null || true
 }
 
 do_it()