maas-images

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

  1. Git
  2. lp:~xnox/maas-images
  3. master
  4. Merge into master
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 0402535eb52e220e9fe419ac1be4b31f73d10387
Proposed branch: ~xnox/maas-images:master
Merge into: maas-images:master
Diff against target: 12 lines (+1/-1)
1 file modified
bin/maas-cloudimg2ephemeral (+1/-1)
Reviewer Review Type Date Requested Status
maintainers of maas images Pending
Review via email: mp+364247@code.launchpad.net

Commit message

MAAS images are failing to build....

.... as my last patch had a sh syntax error

Mon, 11 Mar 2019 03:45:27 +0000: starting maas-cloudimg2ephemeral -vv --arch=amd64 /tmp/maas-cloudimg2eph2.pQ3m6a/root.img none /tmp/maas-cloudimg2eph2.pQ3m6a/none-kernel /tmp/maas-cloudimg2eph2.pQ3m6a/none-initrd /tmp/maas-cloudimg2eph2.pQ3m6a/manifest
/build/config/maas/bin/maas-cloudimg2ephemeral: line 368: syntax error near unexpected token `;;'
/build/config/maas/bin/maas-cloudimg2ephemeral: line 368: ` ;;'
failed to turn /tmp/maas-cloudimg2eph2.pQ3m6a/root.img to ephemeral

This should fix it.

To post a comment you must log in.

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 9b526c5..aedec14 100755
3--- a/bin/maas-cloudimg2ephemeral
4+++ b/bin/maas-cloudimg2ephemeral
5@@ -364,7 +364,7 @@ apply_updates_chrooted() {
6 precise|trusty|xenial|bionic)
7 ;;
8 *)
9- rel_pkgs="${rel_pkgs} cryptsetup-initramfs";;
10+ rel_pkgs="${rel_pkgs} cryptsetup-initramfs"
11 ;;
12 esac
13

Subscribers

People subscribed via source and target branches