Merge lp:~xnox/debian-cd/subiquity-maas into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Dimitri John Ledkov on 2018-03-02
Status: Merged
Approved by: Łukasz Zemczak on 2018-04-10
Approved revision: 1988
Merged at revision: 1989
Proposed branch: lp:~xnox/debian-cd/subiquity-maas
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 18 lines (+8/-0)
1 file modified
tools/add_live_filesystem (+8/-0)
To merge this branch: bzr merge lp:~xnox/debian-cd/subiquity-maas
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2018-04-10 Approve on 2018-04-10
Michael Hudson-Doyle (community) Approve on 2018-04-10
Steve Langasek 2018-03-02 Needs Information on 2018-03-04
Review via email: mp+340419@code.launchpad.net

Description of the change

Add maas squashfs for subiquity MAAS install support.

To post a comment you must log in.
lp:~xnox/debian-cd/subiquity-maas updated on 2018-03-03
1986. By Steve Langasek on 2018-03-03

Merge lp:~mwhudson/debian-cd/live-server-cmdline-2 (with fixups)

Steve Langasek (vorlon) wrote :

Should this be generalized, rather than continuing to hard-code a list of squashfs names? (For comparison, casper itself uses a glob, it does not have a hard-coded list.)

review: Needs Information
Dimitri John Ledkov (xnox) :
Steve Langasek (vorlon) :
lp:~xnox/debian-cd/subiquity-maas updated on 2018-04-10
1988. By Dimitri John Ledkov on 2018-04-10

Ship maas squashfs in a subdir.

Dimitri John Ledkov (xnox) wrote :

> Should this be generalized, rather than continuing to hard-code a list of squashfs names? (For comparison, casper
> itself uses a glob, it does not have a hard-coded list.)

No, as these are not to be mounted by casper nor to be used as a "live" environment. The live system will mount these elsewhere, as of when needed, for the installation.

Dimitri John Ledkov (xnox) wrote :

moved these into a subdir, to avoid casper mounting these.

Michael Hudson-Doyle (mwhudson) wrote :

This looks fine to me now.

review: Approve
Łukasz Zemczak (sil2100) wrote :

Should be fine.

review: Approve
Łukasz Zemczak (sil2100) wrote :

(this is now merged into the main debian-cd branch that's on nusakan).

Steve Langasek (vorlon) wrote :

On Tue, Apr 10, 2018 at 09:09:28AM -0000, Dimitri John Ledkov wrote:
> > Should this be generalized, rather than continuing to hard-code a list of squashfs names? (For comparison, casper
> > itself uses a glob, it does not have a hard-coded list.)

> No, as these are not to be mounted by casper nor to be used as a "live"
> environment. The live system will mount these elsewhere, as of when
> needed, for the installation.

Right, but should we need to change debian-cd every time a new squashfs is
added to the output, if it's *not* going to be mounted at boot? Or should
debian-cd take all extra livefses produced and by default stick them in this
subdirectory?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/add_live_filesystem'
2--- tools/add_live_filesystem 2018-02-23 13:07:01 +0000
3+++ tools/add_live_filesystem 2018-04-10 09:08:11 +0000
4@@ -18,6 +18,14 @@
5 if [ -e "$LIVEIMAGES/$FULLARCH.squashfs.gpg" ]; then
6 ln "$LIVEIMAGES/$FULLARCH.squashfs.gpg" "$BDIR/CD1/$DIR/filesystem.squashfs.gpg"
7 fi
8+ if [ -e "$LIVEIMAGES/$FULLARCH.maas-rack.squashfs" ]; then
9+ mkdir -p "$BDIR/CD1/$DIR/maas/"
10+ ln "$LIVEIMAGES/$FULLARCH.maas-rack.squashfs" "$BDIR/CD1/$DIR/maas/maas-rack.squashfs"
11+ fi
12+ if [ -e "$LIVEIMAGES/$FULLARCH.maas-region.squashfs" ]; then
13+ mkdir -p "$BDIR/CD1/$DIR/maas/"
14+ ln "$LIVEIMAGES/$FULLARCH.maas-region.squashfs" "$BDIR/CD1/$DIR/maas/maas-region.squashfs"
15+ fi
16
17 if [ -e "$LIVEIMAGES/$FULLARCH.installer.squashfs" ]; then
18 ln "$LIVEIMAGES/$FULLARCH.installer.squashfs" "$BDIR/CD1/$DIR/installer.squashfs"

Subscribers

People subscribed via source and target branches