Merge ~xnox/maas-images:master into maas-images:master

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 6b2b6fb1cceed384bdf1635645ef2fab86eb8083
Proposed branch: ~xnox/maas-images:master
Merge into: maas-images:master
Diff against target: 19 lines (+8/-0)
1 file modified
bin/maas-cloudimg2ephemeral (+8/-0)
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+364047@code.launchpad.net

Commit message

LP: #1818876 - Add cryptsetup-initramfs on cosmic and up.

Description of the change

LP: #1818876 - Add cryptsetup-initramfs on cosmic and up.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The expectation is that cryptroot initramfs hook is available, initramfs is rebuilt, and magically includes a lot more crypto modules.

Revision history for this message
Lee Trager (ltrager) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/maas-cloudimg2ephemeral b/bin/maas-cloudimg2ephemeral
2index 4591d15..9b526c5 100755
3--- a/bin/maas-cloudimg2ephemeral
4+++ b/bin/maas-cloudimg2ephemeral
5@@ -359,6 +359,14 @@ apply_updates_chrooted() {
6 precise|quantal|raring|saucy|trusty|utopic|vivid)
7 rel_pkgs="${rel_pkgs} maas-enlist";;
8 esac
9+ # rel_pkgs: include cryptsetup-initramfs on cosmic and up LP: #1818876
10+ case "$release" in
11+ precise|trusty|xenial|bionic)
12+ ;;
13+ *)
14+ rel_pkgs="${rel_pkgs} cryptsetup-initramfs";;
15+ ;;
16+ esac
17
18 change="add u-boot-tools to arch_pkgs for arch '$arch' (LP: #1640519)"
19 if [ "$arch" = "arm64" -o "$arch" = "armhf" ]; then

Subscribers

People subscribed via source and target branches