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

[Dimitri John Ledkov]

Add maas squashfs for subiquity MAAS install support.

[lp:~xnox/debian-cd/subiquity-maas]

1986. By Steve Langasek on 2018-03-03

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

[Steve Langasek (vorlon)]

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

[lp:~xnox/debian-cd/subiquity-maas]

1988. By Dimitri John Ledkov on 2018-04-10

Ship maas squashfs in a subdir.

[Dimitri John Ledkov (xnox)]

> 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)]

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

[Michael Hudson-Doyle (mwhudson)]

This looks fine to me now.

review: Approve

[Łukasz Zemczak (sil2100)]

Should be fine.

review: Approve

[Łukasz Zemczak (sil2100)]

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

[Steve Langasek (vorlon)]

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?

=== modified file 'tools/add_live_filesystem'
--- tools/add_live_filesystem	2018-02-23 13:07:01 +0000
+++ tools/add_live_filesystem	2018-04-10 09:08:11 +0000
@@ -18,6 +18,14 @@
 	if [ -e "$LIVEIMAGES/$FULLARCH.squashfs.gpg" ]; then
 		ln "$LIVEIMAGES/$FULLARCH.squashfs.gpg" "$BDIR/CD1/$DIR/filesystem.squashfs.gpg"
 	fi
+	if [ -e "$LIVEIMAGES/$FULLARCH.maas-rack.squashfs" ]; then
+		mkdir -p "$BDIR/CD1/$DIR/maas/"
+		ln "$LIVEIMAGES/$FULLARCH.maas-rack.squashfs" "$BDIR/CD1/$DIR/maas/maas-rack.squashfs"
+	fi
+	if [ -e "$LIVEIMAGES/$FULLARCH.maas-region.squashfs" ]; then
+		mkdir -p "$BDIR/CD1/$DIR/maas/"
+		ln "$LIVEIMAGES/$FULLARCH.maas-region.squashfs" "$BDIR/CD1/$DIR/maas/maas-region.squashfs"
+	fi
 
 	if [ -e "$LIVEIMAGES/$FULLARCH.installer.squashfs" ]; then
 		ln "$LIVEIMAGES/$FULLARCH.installer.squashfs" "$BDIR/CD1/$DIR/installer.squashfs"